[nss-softokn/f19: 2/2] Merge branch 'master' into f19

[Elio Maldonado]

commit 229e61b3a31562a4792c2632190b1d4010d52739
Merge: 647094f df0679e
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Jul 4 18:57:49 2013 -0700

    Merge branch 'master' into f19
    
    - Update to NSS_3_15_1_RTM

 .gitignore       |    2 +-
 nss-softokn.spec |    9 ++++++---
 sources          |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --cc nss-softokn.spec
index 5b3e51e,4242b01..0d47a5b
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -390,10 -390,18 +390,13 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
+ * Tue Jul 02 2013 Elio Maldonado <emaldona at redhat.com> - 3.15.1-1
+ - Update to NSS_3_15_1_RTM
+ 
  * Mon Jun 17 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-3
 -- Require nspr-4.10 or greater
 -- Fix patch to select tests to run
 -
 -* Thu Jun 13 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-2
 -- Select the tests suite to run based on the build type
 -
 -* Wed May 29 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-1
  - Update to NSS_3_15_RTM
 +- Require nspr-4.10 or greater
 +- Fix patch that selects tests to run
  
  * Tue Apr 23 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-0.1.beta.3
  - Reverse the last changes since pk11gcmtest properly belongs to nss