Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Mon, 4 Jul 2011 08:51:29 +0000 (10:51 +0200)
committerthe_mgt <themgt@ueberserver.de>
Mon, 4 Jul 2011 08:51:29 +0000 (10:51 +0200)
commit78414f0d79888ce5cd401c52f4e948b416c81587
tree19209651bc5138dc6b584d05f137c5ed1d8ae12c
parent45f3146f488eebd0fc3fa86d0d30aafa3f2cc999
parentd004835d407a36d4e444b9ebc76f84136cdf816c
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel