[nspr/f17: 3/3] Merge branch 'f18' into f17

[Elio Maldonado]

commit e32cfcfcb56c3e44e1bd7406ade465b5628bb2ce
Merge: dd9caa6 2528b4e
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Feb 5 08:53:59 2013 -0800

    Merge branch 'f18' into f17
    
    - Update to NSPR_4_9_5_RTM

 .gitignore |    2 +-
 nspr.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---