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

[Toshio くらとみ]

commit d9e28f5bfc60378a64f10e3207019b10ad3b1b16
Merge: 1d41a8e e8e2bb6
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Feb 5 14:22:56 2013 -0800

    Merge branch 'master' into el6

 .gitignore         |    2 ++
 python-fedora.spec |    8 +++++++-
 sources            |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---