Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 20 Sep 2011 20:51:51 +0000 (20:51 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 20 Sep 2011 20:51:51 +0000 (20:51 +0000)
commit0a85158664e2ece7e50ed03b39cd39fd42c427c9
tree106e8423ada88a214d5ae87ec378ddab89c2a53f
parent89f8e4f10bae0be94c3c329be23a10730ceef039
parent2d758b84511c6a1b68ad907d380df8d0a55b3c02
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel