94b5b59 Merge branch 'master' of ssh://pkgs.fedoraproject.org/zarafa

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