Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 29 Dec 2011 12:02:48 +0000 (13:02 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 29 Dec 2011 12:02:48 +0000 (13:02 +0100)
commit87adb75f05be524428f1563ab28a60b1795f4612
treed1ff307788e6d67daef45d849ed512f089defac2
parentd2f099415dcc15ed038aa148701bcd05b8d2c965
parent80598eb9c1cf339151a66e3bdf1b7756efdde1a2
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel