commit 73f3a4a065182bb8d0aabec0191dcd1b400cc9d9 Merge: 93afaac 951300e Author: Elio Maldonado <emaldona at redhat.com> Date: Fri Oct 4 07:52:46 2013 -0700 Merge branch 'f19' into f18 - Update to nspr-4.10.1 .gitignore | 2 +- nspr.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) ---