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

[Toshio くらとみ]

commit afaceac19086b364712f33898c67f3905306729e
Merge: 92d8912 0c6685b
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Jan 22 18:10:23 2013 -0800

    Merge branch 'master' into el6

 .gitignore         |    1 +
 python-fedora.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---