Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 22 Apr 2012 08:34:55 +0000 (10:34 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 22 Apr 2012 08:34:55 +0000 (10:34 +0200)
commit2108195fbb926251308e8bc0efba6b9bf2cd7a43
treea5106e11d0154f1ec577f113ab3bca13611abc93
parentf78394f2320d8d9d9efb3ea7da3dc740de1ef1e3
parent5dde04076f84b60ce14bd79b4157f06af3008981
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel