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

[Elio Maldonado]

commit e6e00b5d1777a48ad5b6d1fdb0bb96552d3773fd
Merge: 35d6046 d51a6dc
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Mar 23 07:28:41 2015 -0700

    Merge branch 'master' into f21
    
    - Update to nss-3.18

 .gitignore       | 2 +-
 nss-softokn.spec | 9 ++++++---
 sources          | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---