5369452 Merge branch 'master' into f20

Merged and Committed by pghmcfc 10 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	perl-BerkeleyDB.spec
    
        
file modified
+6 -2
file modified
+1 -1