648c56d Merge branch 'master' into f21

Merged and Committed by Nikos Mavrogiannopoulos 9 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	libtasn1.spec
    
        
file modified
+2 -0
file modified
+5 -2
file modified
+2 -2