commit c1505d921126e2062f50422db052c1a5a6c2b213 Merge: 18ed345 692d991 Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com> Date: Thu Jun 28 13:30:46 2012 +0100 Merge branch 'master' of ssh://pkgs.fedoraproject.org/libkolab ---