New branch 'dev/configuration-handling' available with the following commits:
commit 171b2d1f1e104c9c1110a722c7bc62fe1c407c8f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Fri Mar 30 11:52:34 2012 +0100
Improve configuration handling