Merge branch 'master' into 'master'

Fix nss.changes See merge request !4
sailfishos · Mar 11, 2015 · 6d30e43 · 6d30e43
2 parents 2ea01a4 + 64d81f3
commit 6d30e43
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/nss.changes b/nss.changes
@@ -1,3 +1,9 @@
+* Wed Mar 11 2015 Pasi Sjöholm <pasi.sjoholm@jollamobile.com> - 3.16.6
+- Fix nss.changes
+
+* Wed Nov 26 2014 John Brooks <john.brooks@jollamobile.com> - 3.16.6
+- Update to 3.16.6 and split libnssckbi into a separate package
+
 * Tue Sep 25 2014 Pasi Sjöholm <pasi.sjoholm@jollamobile.com> - 3.16.5
 - Update to 3.16.5
 - Fixes CVE-2014-1568.