c2a1600 Merge branch 'master' into f21

Merged and Committed by tmraz 9 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	libpwquality.spec
    
        
file modified
+1 -0
file modified
+42 -14
file modified
+1 -1