[nss/f20: 7/8] Merge branch 'master' into f20

[Elio Maldonado]

commit 91a42045c06aa5789476dcc06e783d2f54414d1b
Merge: a0fd8d9 301ed12
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Jan 16 17:08:55 2014 -0800

    Merge branch 'master' into f20

 .gitignore                                         |    4 +-
 0001-sync-up-with-upstream-softokn-changes.patch   |  406 --------------------
 ...h-nss-3.15.4-changes-in-freebl-and-softok.patch |  196 ++++++++++
 ...96651-pem-dont-trash-keys-on-failed-login.patch |   44 ---
 certutil_keyOpFlagsFix.patch                       |   24 --
 disable-ocsp-stapling-tests.patch                  |    9 -
 document-certutil-email-option.patch               |   25 --
 iquote.patch                                       |   32 +-
 nss-ssl-cbc-random-iv-off-by-default.patch         |   25 --
 nss.spec                                           |   35 +-
 sources                                            |    4 +-
 11 files changed, 236 insertions(+), 568 deletions(-)
---