commit 8bdb5368277682fc6b8c87e6dc42c716163e1ae3 Merge: 630eb4f 2a88c6f Author: Robert Scheck <robert at fedoraproject.org> Date: Fri Jan 13 01:33:20 2012 +0100 Merge branch 'el6' of ssh://pkgs.fedoraproject.org/zarafa into el6 ---