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

[Elio Maldonado]

commit 1540bd070313e5381f1f5c62eeb2d365ab841192
Merge: aebbee0 53506cb
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Aug 19 14:02:12 2014 -0700

    Merge branch 'master' into f21

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