commit 30112c1f7392667b4f60cc49f3223ae85afb6cd7
Merge: 2054b1d 969c581
Author: Elio Maldonado <emaldona at redhat.com>
Date: Sat May 7 11:55:42 2011 -0700
Merge branch 'f14' into f13
.gitignore | 2 +-
nspr.spec | 11 ++++++++++-
sources | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
---