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

[Elio Maldonado]

commit aacaec42a3974f6fe98abebaf63e755545dbaab6
Merge: 9f659aa f820cc6
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Jul 1 12:20:30 2014 -0700

    Merge branch 'f20' into f19
    
    - Update to nss-3.16.2

 .gitignore                      |    2 +-
 mozbug-972450.patch             |   22 --------------------
 nss-softokn.spec                |   12 +++++-----
 nss-versus-softoken-tests.patch |   42 ---------------------------------------
 sources                         |    2 +-
 5 files changed, 8 insertions(+), 72 deletions(-)
---