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

[Elio Maldonado]

commit 14bda17b42422ee175dd2a973368e7347d1209b2
Merge: 0ec5aae d0c651c
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Dec 1 14:08:44 2013 -0800

    Merge branch 'master' into f20

 .gitignore       |    2 +-
 nss-softokn.spec |   14 +++++++++-----
 sources          |    2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --cc nss-softokn.spec
index 751350e,12b8492..955abfa
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -51,7 -51,7 +51,7 @@@ Source0:          %{name}-%{version}.ta
  # cd nss-softokn
  # Split off nss-softokn out of the full nss source tar ball:
  # sh ./nss-split-softokn.sh ${version}
--# A file named {name}-{version}.tar.bz2 should appear
++# A file named {name}-{version}.tar.gz should appear
  # which is ready for uploading to the lookaside cache.
  Source1:          nss-split-softokn.sh
  Source2:          nss-softokn.pc.in
@@@ -386,8 -386,12 +386,12 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
 -* 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
+ 
 -* Thu Oct 17 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-2
 -- Split off nss-softokn from the full nss sources as released upstream
 +* Sun Oct 27 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-2
 +- Split off nss-softokn from the full pristine nss sources from  upstream
  - Bug 1019244 - ECDHE in openssl available -> NSS needs too for Firefox/Thunderbird
  
  * Thu Sep 26 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-1