Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 14 Jul 2012 14:51:18 +0000 (16:51 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 14 Jul 2012 14:51:18 +0000 (16:51 +0200)
commitbcfb3181089aad4fb059320f5a5046fa9087e91e
treee2704eda084a6ed7249daf9d40ceaa82b58f91f4
parentbb67c07609915743a4d4693748f8cadb1f32afae
parent6689604c7ddea0eb6c25bd38c90fee99025b28fb
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

ry,