Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Mon, 30 May 2011 22:52:09 +0000 (00:52 +0200)
committerthe_mgt <themgt@ueberserver.de>
Mon, 30 May 2011 22:52:09 +0000 (00:52 +0200)
commitf6c278900e1fd02aedd2cc7549d3eb6cf562ad00
treea15298bc78c8c840275205a0c753fefb4441299e
parent244a8020ca7ab13d491de0a33810db4b23c3d010
parentb5551d4425dbde8a126040e8ee41902741559de4
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel