[zarafa/f21: 5/5] Merge branch 'f21' of ssh://pkgs.fedoraproject.org/zarafa into f21

[Robert Scheck]

commit 1b451fb6f49ead01b4dcb0ddd31a8b03ff25d457
Merge: 00cb5e0 4a32efa
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Aug 25 22:49:20 2014 +0200

    Merge branch 'f21' of ssh://pkgs.fedoraproject.org/zarafa into f21
    
    Conflicts:
    	zarafa.spec

---