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

Wed Aug 22 15:45:51 UTC 2012

commit 88952e65acaf1ea16ee7fb5117b88c26b83db4a5
Merge: a12c9fa 7e1f9c8
Author: Ricky Elrod <ricky at elrod.me>
Date:   Wed Aug 22 11:45:03 2012 -0400

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

 .gitignore        |    3 +++
 python-flask.spec |    7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
---