Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 28 Nov 2011 21:25:29 +0000 (22:25 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 28 Nov 2011 21:25:29 +0000 (22:25 +0100)
commit6afa3d124174856ef257e2d666dea8fd9b62dc7c
tree94cc04f4943ceabc1a0d22a9bb008a3ffbd44f43
parent5caf251b54c8ccd56f56441e256e13e88d2645f1
parent0e45fd5e909acba2d4190af2fb95597e9c93e8f7
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel