Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Sat, 16 Jul 2011 13:17:52 +0000 (15:17 +0200)
committerthe_mgt <themgt@ueberserver.de>
Sat, 16 Jul 2011 13:17:52 +0000 (15:17 +0200)
commit75c48c461626f625d6f70553f86f37c1d6464288
treec52b3066376e83763a3bd21de4af4cbc6565e244
parentfc95d07b8ee835a22fe0516aca005ebe4b4bd90d
parent31d610fd5449b97e8d5087edb160ad7c5494f485
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel