[nspr/f19: 9/9] Merge branch 'f20' into f19

[Elio Maldonado]

commit 9706807fc76a941766f8bf5f0be03abcc1fae182
Merge: 1540736 d184d5b
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Jun 10 07:38:32 2014 -0700

    Merge branch 'f20' into f19
    
    - Update to nspr-4.10.6

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