[nss-util/f19: 10/10] Merge branch 'master' into f19

[Elio Maldonado]

commit ac26ff34df217bcda322f3f2a2f919eee771b76f
Merge: 6fbb611 2f738eb
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Dec 6 09:53:45 2014 -0800

    Merge branch 'master' into f19
    
     - cherry-pick from master and f20

 .gitignore    |    2 +-
 nss-util.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc nss-util.spec
index b521c92,c2c72fa..77a7e01
--- a/nss-util.spec
+++ b/nss-util.spec
@@@ -225,7 -225,10 +225,10 @@@ don
  %{_includedir}/nss3/templates/templates.c
  
  %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
+ 
 -* 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