[nss-softokn/f18: 11/11] Merge branch 'f19' into f18 to update to nss-3.15.1

[Elio Maldonado]

commit 7ec37de4e4410b72f050beb6163bff48e570553c
Merge: 4e34fec 229e61b
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Jul 21 11:30:49 2013 -0700

    Merge branch 'f19' into f18 to update to nss-3.15.1

 .gitignore                               |    2 +-
 build-nss-softoken-only.patch            |   49 ++++++++--------
 iquote.patch                             |   28 +++++-----
 mozilla-crypto-strip.sh                  |    4 +-
 nss-softokn.spec                         |   89 ++++++++++++++++++----------
 nss-split-softokn.sh                     |   94 ++++++++++++++----------------
 nss-versus-softoken-tests.patch          |   42 +++++++++++++
 softoken-minimal-test-dependencies.patch |   81 ++++++-------------------
 sources                                  |    2 +-
 9 files changed, 207 insertions(+), 184 deletions(-)
---