ae522c Merge remote branch 'origin/master' into f14/master

Merged and Committed by Rex Dieter 13 years ago
1 file changed. 14 lines added. 2 lines removed.
    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	akonadi.spec
    
        
file modified
+14 -2