Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 19 Jul 2012 10:18:41 +0000 (12:18 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 19 Jul 2012 10:18:41 +0000 (12:18 +0200)
commitc7d361a0f38f6b7a8066c1a0b9b677cee7e15ebb
tree12124bdd26f7a96dc8b8c7e9da8f581b89cc6fb0
parentc7e375305972f782df094cb4c94d68bf42a46ea8
parente9eb0cfb6a9fe0e9b7b2bd81fce7bc9f6ee14a0d
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel