[nss-softokn/f20: 2/2] Merge branch 'master' into f20

[Elio Maldonado]

commit 739bf9304233dc5d6cfdf5b0704b7583620f13dc
Merge: 14bda17 a59e131
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Jan 16 16:00:47 2014 -0800

    Merge branch 'master' into f20
    
    - Update to NSS_3_15_4_RTM
    
    Conflicts:
    	nss-softokn.spec

 .gitignore                    |    2 +-
 build-nss-softoken-only.patch |    2 +-
 iquote.patch                  |   24 ++++++++++++++++++------
 nss-softokn.spec              |    8 ++++++--
 sources                       |    2 +-
 5 files changed, 27 insertions(+), 11 deletions(-)
---
diff --cc nss-softokn.spec
index 955abfa,6579d07..a0121d6
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -386,7 -386,11 +386,11 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
+ * Tue Jan 07 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.3-2
+ - Update to NSS_3_15_4_RTM
+ - Resolves: Bug 1049229 - nss-3.15.4 is available
+ 
 -* Tue Nov 26 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-3
 +* Sun Nov 01 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-3
  - Update to NSS_3_15_3_RTM
  - Related: Bug 1031897 - CVE-2013-5605 CVE-2013-5606 CVE-2013-1741