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

[Elio Maldonado]

commit 9f659aa9e97f2e133b9d16cdab23b6c9a37f9730
Merge: eccfd12 f7ef232
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu May 8 07:54:26 2014 -0700

    Merge branch 'f20' into f19

 .gitignore       |    2 +-
 nss-softokn.spec |   16 ++++++++--------
 sources          |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
---