Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 29 Jun 2011 22:48:54 +0000 (22:48 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 29 Jun 2011 22:48:54 +0000 (22:48 +0000)
commite855e5f1023a379d266be5e7e01d4c12d832c270
treebd5472ceed9792e91b3a3fa01ff7652edc93ddd4
parent0b98816ce31faadc6d33d646c43d1352cf82ce24
parentce553f3f5830fefc13aec919339b0796e516f7d1
Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x