ff6e1c1 Merge branch 'master' into f19

Merged and Committed by Elio Maldonado 10 years ago
    Merge branch 'master' into f19
    
    - Fix Bug 981166 - xulrunner requires an wrong version of nspr
    
        
file modified
+1 -1
file modified
+7 -3
file modified
+1 -1