Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Fri, 1 Jul 2011 01:06:58 +0000 (03:06 +0200)
committerthe_mgt <themgt@ueberserver.de>
Fri, 1 Jul 2011 01:06:58 +0000 (03:06 +0200)
commitae972bc8e758bdc8d92fcd2b9571aeeccd32101d
treeed74e463b8838cee5c15abdeda6244236e3fc8b9
parent02e276e3229bd93deac8926195c624f063f931e3
parentb6292366a603fa89e22afcce4c3d4a7f5bafc268
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel