commit 2b8a4a5f1c8f5ce7a09e230068b9802f53a97a60 Merge: 6e51633 4f21250 Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com> Date: Tue Jun 26 16:08:29 2012 +0100 Merge branch 'master' of ssh://pkgs.fedoraproject.org/libkolabxml ---