[python-flask/el6: 9/9] Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-flask into el6

[Ricky Elrod]

commit 149a2abcd9a7bbb6a3443d445be8c2b2886d0a50
Merge: ea26a35 e8bf22f
Author: Ricky Elrod <ricky at elrod.me>
Date:   Wed Aug 8 04:51:32 2012 -0400

    Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-flask into el6
    
    Conflicts:
    	.gitignore
    	python-flask.spec
    	sources

 sources |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc sources
index 55b4fdb,f45e363..d50feb3
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +4a89ef2b3ab0f151f781182bd0cc8933  Flask-0.9.tar.gz
++=======
+ a5169306cfe49b3b369086f2a63816ab  Flask-0.8.tar.gz
++>>>>>>> e8bf22fcda96626a3cd36e7ff44d3c8aba838e01