d8f044d Merge remote branch 'origin/master' into f13/master

Merged and Committed by rdieter 13 years ago
    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	akonadi.spec
    
        
file modified
+1 -1
akonadi-mysql_conf.patch akonadi-1.1.1-mysql_conf.patch
file renamed
+5 -4
file modified
+71 -16
file modified
+1 -1