commit ea92498544b13617bca4430c2ac2029e1a5b1a05 Merge: 50df742 152c78d Author: Robert Scheck <robert at fedoraproject.org> Date: Fri Jan 13 01:32:27 2012 +0100 Merge branch 'f15' of ssh://pkgs.fedoraproject.org/zarafa into f15 ---