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

[Elio Maldonado]

commit 96f1eefcb9f741460124c4c700b8b3b66d55b7df
Merge: 108c18c 72baee1
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Dec 1 14:06:59 2013 -0800

    Merge branch 'master' into f20

 .gitignore                       |    2 +-
 hasht-dont-include-prtypes.patch |    6 +++---
 nss-util.spec                    |   10 +++++++---
 sources                          |    2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)
---
diff --cc nss-util.spec
index d8decc2,b704c26..ed2bfd6
--- a/nss-util.spec
+++ b/nss-util.spec
@@@ -220,7 -220,11 +220,11 @@@ don
  %{_includedir}/nss3/templates/templates.c
  
  %changelog
 -* Sun Nov 24 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.3-1
++* Sun Dec 01 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.3-1
+ - Update to NSS_3_15_3_RTM
+ - Related: Bug 1031897 - CVE-2013-5605 CVE-2013-5606 CVE-2013-1741
+ 
 -* Wed Oct 23 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-2
 +* Sun Oct 27 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-2
  - Split off nss-util from full nss sources as released upstream
  
  * Thu Sep 26 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-1