Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Wed, 6 Jul 2011 22:58:14 +0000 (00:58 +0200)
committerthe_mgt <themgt@ueberserver.de>
Wed, 6 Jul 2011 22:58:14 +0000 (00:58 +0200)
commitac705a1b9f980154551ffa13084a5b9b2742a39b
treed2b86c5d0382a1b76a6ed897561da6fa999dfbab
parent3ee26c3bc8ca3092f1e05e11d3cc773cea7748fa
parent0700d2580a870f92008686de2cdf42b4759033ab
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel