d9e3835 Merge branch 'master' into f19

Merged and Committed by mrunge 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	python-testtools.spec
    
        
file modified
+8 -2