[nss/f20: 4/4] Merge branch 'master' into f20

Elio Maldonado emaldonado at fedoraproject.org
Wed Dec 11 21:21:10 UTC 2013


commit 7b557ce61e99a98cc5d037e003dc23b682f5da24
Merge: 3467922 b556786
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Dec 11 11:46:07 2013 -0800

    Merge branch 'master' into f20

 .gitignore |    2 +-
 nss.spec   |    9 +++++++--
 sources    |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc nss.spec
index 77462fc,f33fe5f..d88a5c6
--- a/nss.spec
+++ b/nss.spec
@@@ -749,8 -749,13 +749,13 @@@ f
  
  
  %changelog
+ * Wed Dec 11 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
 -- Bump the release tag
 +- 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
  - Update to NSS_3_15_3_RTM


More information about the scm-commits mailing list