[nspr/f20: 8/8] Merge branch 'master' into f20

[Elio Maldonado]

commit d184d5ba02b01394ffd411265fdf2cdd8e32f54e
Merge: 5c07b3a a07c928
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Jun 10 07:36:47 2014 -0700

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

 .gitignore |    2 +-
 nspr.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc nspr.spec
index 62bb3f4,4631f3f..ed868de
--- a/nspr.spec
+++ b/nspr.spec
@@@ -140,8 -140,19 +140,11 @@@ don
  %{_mandir}/man*/*
  
  %changelog
+ * Tue Jun 10 2014 Elio Maldonado <emaldona at redhat.com> - 4.10.6-1
+ - Update to NSPR_4_10_6_RTM
+ 
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.10.5-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Tue May 06 2014 Elio Maldonado <emaldona at redhat.com> - 4.10.5-1
 +* Wed May 07 2014 Elio Maldonado <emaldona at redhat.com> - 4.10.4-2
  - Update to NSPR_4_10_5_RTM
 -- Remove patch no longer needed due to the rebase
 -
 -* Wed Apr 02 2014 Elio Maldonado <emaldona at redhat.com> - 4.10.4-2
 -- Resolves: Bug 1083725 - Add ppc64le support to nspr
 -- Use a patch by Ulrich Weigand already applied upstream
  
  * Sat Mar 15 2014 Elio Maldonado <emaldona at redhat.com> - 4.10.4-1
  - Update to NSPR_4_10_4_RTM