[nss/f19: 5/5] Merge branch 'f20' into f19

[Elio Maldonado]

commit c129cf0bc31c411d54c57c9f10fb20f7e9760f4d
Merge: 0fd0ef5 7b557ce
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Dec 18 07:56:17 2013 -0800

    Merge branch 'f20' into f19
    
    - Cherry-pick merge

 .gitignore |    2 +-
 nss.spec   |   10 ++++++++--
 sources    |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc nss.spec
index bf7f3b5,d88a5c6..5289d11
--- a/nss.spec
+++ b/nss.spec
@@@ -182,8 -180,6 +182,8 @@@ 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
  %patch45 -p0 -b .notrash
@@@ -753,7 -749,15 +753,13 @@@ f
  
  
  %changelog
 -* Wed Dec 11 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.3.1-1
++* Wed Dec 18 2013 Elio Maldonado <emaldona at 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
 -
 -* Tue Dec 03 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.3-2
+ - Install symlink to setup-nsssysinit.sh, without suffix, to match manpage
+ 
 -* Sun Nov 24 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.3-1
 +* Wed Dec 04 2013 Elio Maldonado <emaldona at 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
  - Fix option descriptions for setup-nsssysinit manpage