[python-fedora/el6: 3/3] Merge branch 'master' into el6

[Toshio くらとみ]

commit 2686716dc12de9978ab0606b2d0066a59a847850
Merge: d9e28f5 bba62b6
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Jul 23 23:18:55 2013 -0700

    Merge branch 'master' into el6

 flask_fas_openid.py |  211 +++++++++++++++++++++++++++++++++++++++++++++++++++
 python-fedora.spec  |   18 ++++-
 2 files changed, 228 insertions(+), 1 deletions(-)
---