commit 57c77df7d436a2986f2268c2ef2dc16e241f8ab2 Merge: b47fd21 c1505d9 Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com> Date: Thu Jun 28 13:42:25 2012 +0100 Merge branch 'master' into f17 ---