e9cfe5f Merge branch 'master' into f20

Merged and Committed by Rex Dieter 10 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	kdelibs.spec
    	sources
    
        
file modified
+4 -2
kdelibs-4.11.97-kstandarddirs.patch kdelibs-4.10.0-kstandarddirs.patch
file renamed
+9 -10
file modified
+33 -22
file modified
+1 -1