[python-flask/el6: 3/3] Merge branch 'f19' into el6

[Ricky Elrod]

commit 3948e972597b119b8878d9e20d94ac2ccea81744
Merge: 5e84931 00f1b68
Author: Ricky Elrod <ricky at elrod.me>
Date:   Wed Feb 26 22:19:58 2014 -0500

    Merge branch 'f19' into el6
    
    Conflicts:
    	python-flask.spec

 python-flask.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc python-flask.spec
index feef37f,4058ddd..7bde271
--- a/python-flask.spec
+++ b/python-flask.spec
@@@ -84,7 -84,13 +84,13 @@@ rm -rf examples/jqueryexample/*.py
  %doc docs/_build/html examples
  
  %changelog
+ * Mon Jul 29 2013 Haïkel Guémar <hguemar at fedoraproject.org> - 1:0.9-7
+ - fix wrong requires on sphinx (RHBZ #989361)
+ 
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.9-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
 -* Wed Aug 17 2012 Ricky Elrod <codeblock at fedoraproject.org> - 0.9-5
 +* Sat Aug 17 2012 Ricky Elrod <codeblock at fedoraproject.org> - 0.9-5
  - Add epoch to subpackage Requires.
  
  * Wed Aug 8 2012 Ricky Elrod <codeblock at fedoraproject.org> - 0.9-4