90f2044 Merge branch 'master' into f21

Merged and Committed by jsynacek 9 years ago
    Merge branch 'master' into f21
    
    Let's keep the history linear...
    
    Conflicts:
    	openldap.spec
    
        
file modified
+1 -0
file modified
+8 -7
file modified
+1 -1