339e4ad
Merge branch 'master' of ssh://git.fedorahosted.org/git/fedpkg Conflicts: fedpkg.spec setup.py