b977d7f Merge branch 'master' into f20

Merged and Committed by Christopher Meng 10 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	python-keyring.spec
    	sources
    
        
file modified
+1 -4
file modified
+128 -14
file modified
+4 -0