commit ecd28fae9cc0ef9ca5509f4dfb8df9da9d1fb062 Merge: 2a62e70 57cf18f Author: Elio Maldonado <emaldona at redhat.com> Date: Thu May 8 07:52:58 2014 -0700 Merge branch 'f20' into f19 .gitignore | 2 +- nss-util.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) ---