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

[Sergio Pascual]

commit addb964fd802179cecca30a76843aab79d1b4201
Merge: 66f8004 dd19b3f
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Mon Jun 23 19:25:32 2014 +0200

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

 python-scikit-learn.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-scikit-learn.spec
index 0c2f4c5,0cbb6ff..9030acf
--- a/python-scikit-learn.spec
+++ b/python-scikit-learn.spec
@@@ -150,9 -140,9 +150,12 @@@ pop
  %endif # with_python3
  
  %changelog
 +* Mon Jun 23 2014 Sergio Pascual <sergiopr at fedoraproject.org> - 0.15.0-0.1.b1
 +- New upstream (0.15.0b1), beta release 
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.1-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Mon Jun 02 2014 Bohuslav Kabrda <bkabrda at redhat.com> - 0.14.1-8
  - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4