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

Merged and Committed by toshio 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-paste-deploy
    
    Conflicts:
    	python-paste-deploy.spec
    
        
file modified
+5 -2