commit 2f9b3e4856b8325e8d7a583c0412d674cd8fe193 Merge: 56acd38 c1505d9 Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com> Date: Thu Jun 28 13:43:27 2012 +0100 Merge branch 'master' into el6 ---