Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 18 Feb 2012 16:25:23 +0000 (17:25 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 18 Feb 2012 16:25:23 +0000 (17:25 +0100)
commit307ff84a60b03889b9cd5ff84c29489177f9a39d
treebb84a8906f8581b91c0ca952cf48e21c87bbfa0f
parent4b4dc864ede7c5d8d956febe4a0afb422b78e7c4
parentab3d88bbfb5341241eeab2f9bc543f48e48579b2
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel