[nss/f18: 17/17] Cherry-pick merge branch 'f19' into f18

[Elio Maldonado]

commit 75232d0228ab25c07a97d9176a2a02cea9f4ce9b
Merge: ab028e8 0fd0ef5
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Dec 9 09:38:42 2013 -0800

    Cherry-pick merge branch 'f19' into f18

 .gitignore           |    2 +-
 manpages-fixes.patch |  209 --------------------------------------------------
 nss.spec             |   43 +++++++---
 setup-nsssysinit.xml |   22 ++---
 sources              |    2 +-
 5 files changed, 41 insertions(+), 237 deletions(-)
---
diff --cc nss.spec
index b542a23,bf7f3b5..03d60b3
--- a/nss.spec
+++ b/nss.spec
@@@ -662,6 -753,14 +673,12 @@@ don
  
  
  %changelog
 -* Wed Dec 04 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.3-1
++* Mon Dec 09 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
 -- Fix man page of nss-sysinit wrong path and other flaws
 -- Install symlink to setup-nsssysinit.sh, without suffix, to match manpage
+ - Remove unused patches
+ 
  * Sun Oct 27 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.2-2
  - Use the full pristine sources from upstream
  - Bug 1019245 - ECDHE in openssl available -> NSS needs too for Firefox/Thunderbird