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

[Toshio くらとみ]

commit 4f898268e6197514628ebfc2a263e71f92d4b267
Merge: 55d1bdf 00472ab
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Dec 19 18:34:49 2013 -0800

    Merge branch 'master' into el6

 .gitignore          |    1 +
 flask_fas_openid.py |  211 ---------------------------------------------------
 python-fedora.spec  |   62 ++++++++-------
 sources             |    2 +-
 4 files changed, 35 insertions(+), 241 deletions(-)
---