Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 2 Sep 2010 21:33:34 +0000 (23:33 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 2 Sep 2010 21:33:34 +0000 (23:33 +0200)
commit7b4e3f415c9d2213fd7c530e5c123ab8a0dba2ab
tree8527ee3e3edddfd2d6654fb564ef4537f15f84a5
parent6714f22783d3c60dc20c5d8bbf7499e0cb01ef08
parent9022f0446ec957ea7789e1e1c135d687d4d36b6b
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel