Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 27 Nov 2011 12:49:34 +0000 (13:49 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 27 Nov 2011 12:49:34 +0000 (13:49 +0100)
commit5caf251b54c8ccd56f56441e256e13e88d2645f1
treeb42a9f7725ee9a6e1473f8a8c8634a9b56191cc8
parentb95fb48e5e3c6f3bf42b1b0c92b8920a0ad3801d
parent1d3e487e00d0238ffb4ba295acd82c5932c5a1b2
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel