8725132 Merge branch 'master' into f22

Merged and Committed by mcepl 8 years ago
    Merge branch 'master' into f22
    
    Conflicts:
    	python-cryptography.spec
    
        
file modified
+5 -2