d3f0f56
Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-paste-deploy Conflicts: python-paste-deploy.spec