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

[Toshio くらとみ]

commit 0c7370596017cb1321d57d20327764228692afd2
Merge: a66dd90 9619182
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jun 7 10:06:36 2012 -0700

    Merge branch 'master' into el6

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