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

[Elio Maldonado]

commit 083ddef00dc853c2200e6c97f6b53dd19b33cc03
Merge: 436352c a7df083
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Dec 6 08:25:24 2014 -0800

    Merge branch 'master' into f20

 .gitignore  |    2 +-
 nss.spec    |   16 +++++++++++++---
 sources     |    2 +-
 tls12.patch |   36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 5 deletions(-)
---
diff --cc nss.spec
index d44f093,b6363c6..d0c090b
--- a/nss.spec
+++ b/nss.spec
@@@ -761,7 -766,14 +766,12 @@@ f
  
  
  %changelog
 -* Fri Dec 05 2014 Elio Maldonado <emaldona at redhat.com> - 3.17.3-1
++* Sat Dec 06 2014 Elio Maldonado <emaldona at redhat.com> - 3.17.3-1
+ - Update to nss-3.17.3
+ - Resolves: Bug 1171012 - nss-3.17.3 is available
 -
 -* Thu Oct 16 2014 Elio Maldonado <emaldona at redhat.com> - 3.17.2-2
+ - Resolves: Bug 994599 - Enable TLS 1.2 by default
+ 
 -* Sun Oct 12 2014 Elio Maldonado <emaldona at redhat.com> - 3.17.2-1
 +* Mon Oct 13 2014 Elio Maldonado <emaldona at redhat.com> - 3.17.2-1
  - Update to nss-3.17.2
  
  * Wed Sep 24 2014 Kai Engert <kaie at redhat.com> - 3.17.1-1