[nspr/f16: 4/4] Merge branch 'f17' into f16

[Elio Maldonado]

commit a3445aea38687079e3404938fc794425bfdabafc
Merge: fc11414 e32cfcf
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Thu Feb 7 20:29:23 2013 -0800

    Merge branch 'f17' into f16
    
    - Update nspr to NSPR_4_9_5_RTM

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