[nspr/f18: 4/4] Merge branch 'master' into f18

[Elio Maldonado]

commit d423849972ab6b3ffb547375638388e149f5e71a
Merge: 49cb2aa 16cd4ec
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Dec 22 19:08:05 2012 -0800

    Merge branch 'master' into f18
    
    - Update to NSPR_4_9_4_RTM

 .gitignore |    2 +-
 nspr.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc nspr.spec
index 16a0dd5,19c5724..ede1b4f
--- a/nspr.spec
+++ b/nspr.spec
@@@ -120,6 -120,12 +120,9 @@@ NSPR_VERSION=`./config/nspr-config --ve
  %{_bindir}/nspr-config
  
  %changelog
+ * Mon Dec 17 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.4-1
+ - Update to NSPR_4_9_4_RTM
+ 
 -* Mon Oct 01 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.3-0.1.beta1.1
 -- Update to NSPR_4_9_5_BETA1
 -
  * Sun Aug 26 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.2-1
  - Update to NSPR_4_9_2_RTM