d709e19
Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-rope Conflicts: python-rope.spec