[python-joblib: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-joblib

[Sergio Pascual]

commit 1b4ed10ee8ff451a28d6320ac75c0088b8b74ab1
Merge: 2e14ded 035b513
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Wed Jul 2 11:38:03 2014 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-joblib
    
    Conflicts:
    	python-joblib.spec

 python-joblib.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-joblib.spec
index a03c414,6d37a75..8f11a57
--- a/python-joblib.spec
+++ b/python-joblib.spec
@@@ -104,9 -104,9 +104,12 @@@ pop
  
  
  %changelog
 +* Wed Jul 02 2014 Sergio Pascual <sergiopr at fedoraproject.org> - 0.8.2-1
 +- New upstream release (0.8.2)
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Tue Jun 03 2014 Sergio Pascual <sergiopr at fedoraproject.org> - 0.8.0-2
  - Reverted stylistic changes
  - Run checks on installed files