commit 7263860bbafbadd0b0e9886fcb1235fa0cf7d80b Merge: ecd28fa bf69522 Author: Elio Maldonado <emaldona at redhat.com> Date: Tue Jul 1 12:19:12 2014 -0700 Merge branch 'f20' into f19 - Update to nss-3.16.2 .gitignore | 2 +- nss-util.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) ---