From addb964fd802179cecca30a76843aab79d1b4201 Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fis.ucm.es>
Date: Jun 23 2014 17:25:32 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-scikit-learn


Conflicts:
	python-scikit-learn.spec

---

diff --git a/python-scikit-learn.spec b/python-scikit-learn.spec
index 0c2f4c5..9030acf 100644
--- a/python-scikit-learn.spec
+++ b/python-scikit-learn.spec
@@ -153,6 +153,9 @@ popd
 * Mon Jun 23 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.15.0-0.1.b1
 - New upstream (0.15.0b1), beta release 
 
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.14.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Mon Jun 02 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 0.14.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4