1b451fb Merge branch 'f21' of ssh://pkgs.fedoraproject.org/zarafa into f21

Merged and Committed by robert 9 years ago
0 file changed. 0 lines added. 0 lines removed.
    Merge branch 'f21' of ssh://pkgs.fedoraproject.org/zarafa into f21
    
    Conflicts:
    	zarafa.spec