67ea848 Merge branch 'master' of ssh://pkgs.fedoraproject.org/zarafa

Merged and Committed by robert 12 years ago
1 file changed. 6 lines added. 0 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/zarafa
    
    Conflicts:
    	zarafa.spec
    
        
file modified
+6 -0