Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 8 Feb 2012 18:59:00 +0000 (19:59 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 8 Feb 2012 18:59:00 +0000 (19:59 +0100)
commitc409452f51adb3b1a6645334d083487012dd5428
treedbd42f214daef0386bed695070100d02a7737340
parentd2936614cbe498d48aa8fb12542724845ce4cec2
parenteb9e3a57a6967df3ca5753a763fadf4bf0f14293
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel