commit 154073617f9c8ca8e1b49019291eb95a8c79d955
Merge: c9d8593 5c07b3a
Author: Elio Maldonado <emaldona at redhat.com>
Date: Thu May 8 07:51:09 2014 -0700
Merge branch 'f20' into f19
.gitignore | 2 +-
nspr.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---