Merge branch 'f20' into f19

- Cherry-pick merge

.gitignore

@@ -8,4 +8,4 @@ TestCA.ca.cert
 TestUser50.cert
 TestUser51.cert
 /nss-pem-20130828.tar.bz2
-/nss-3.15.3.tar.gz
+/nss-3.15.3.1.tar.gz

nss.spec

@@ -19,7 +19,7 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.15.3
+Version:          3.15.3.1
 Release:          1%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
@@ -182,7 +182,7 @@ low level services.
 %patch18 -p0 -b .646045
 # link pem against buildroot's freebl, essential when mixing and matching
 %patch25 -p0 -b .systemfreebl
-# activate for stable and beta branches
+# activate for stable branches
 %patch29 -p0 -b .cbcrandomivoff
 %patch40 -p0 -b .noocsptest
 %patch44 -p1 -b .syncupwithupstream
@@ -753,6 +753,12 @@ fi
 
 
 %changelog
+* Wed Dec 18 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.3.1-1
+- Update to nss-3.15.3.1 (hg tag NSS_3_15_3_1_RTM)
+- Resolves: Bug 1040282 - nss: Mis-issued ANSSI/DCSSI certificate (MFSA 2013-117)
+- Resolves: Bug 1040192 - nss-3.15.3.1 is available
+- Install symlink to setup-nsssysinit.sh, without suffix, to match manpage
+
 * Wed Dec 04 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.3-1
 - Update to NSS_3_15_3_RTM
 - Resolves: Bug 1031897 - CVE-2013-5605 CVE-2013-5606 CVE-2013-1741 nss: various flaws

sources

@@ -8,4 +8,4 @@ f998b70c1be25e8bb9f5fdb5d50eb6f2  TestCA.ca.cert
 1b7b6808cd77d5df29bf5bb9e5fac967  TestUser50.cert
 ab0b56dd505a995425c03e5266f7c8d6  TestUser51.cert
 e82dd2b9520f9d0f5d101e7710d59656  nss-pem-20130828.tar.bz2
-1bb267452359bd37e34d072a215873d5  nss-3.15.3.tar.gz
+1d444fffdb1f890a000003b50295b5aa  nss-3.15.3.1.tar.gz