6a8a35 Merge branch 'master' of ssh://pkgs.fedoraproject.org/akonadi

Merged and Committed by Rex Dieter 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/akonadi
    
        
file modified
+2 -1
file modified
+14 -6
file modified
+1 -1