[python-flask/epel7: 6/6] Merge branch 'master' into epel7

[Ricky Elrod]

commit 8eec53eab6ead42c11aabe87e7b5a560e0822841
Merge: aa3582a 817e684
Author: Ricky Elrod <ricky at elrod.me>
Date:   Mon Jan 20 14:37:47 2014 -0500

    Merge branch 'master' into epel7
    
    Conflicts:
    	python-flask.spec

 .gitignore        |    1 +
 python-flask.spec |  131 +++++++++++++++++++++++++++++++++++++++++++++++------
 sources           |    2 +-
 3 files changed, 119 insertions(+), 15 deletions(-)
---