commit 4656d4f7994c05c2b51030132a517fbbb546f482
Merge: 1a56d2a 14bda17
Author: Elio Maldonado <emaldona at redhat.com>
Date: Mon Dec 9 09:15:44 2013 -0800
Merge branch 'f20' into f19
.gitignore | 2 +-
nss-softokn.spec | 23 ++++++++++++++++-------
sources | 2 +-
3 files changed, 18 insertions(+), 9 deletions(-)
---