Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 18 Oct 2012 18:12:17 +0000 (20:12 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 18 Oct 2012 18:12:17 +0000 (20:12 +0200)
commit2f8ba8d58350ea377595b951fb7d20a5618ea0ef
tree2b9b6e525a2243e391fa0028a2f656596079720f
parentb39d860713ddd390339211be8d398c4d4b6680ba
parent74844b0735d7f143fab75ca0dfdaf88c0bf88e6c
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel