Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 18 Jul 2012 15:31:52 +0000 (17:31 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 18 Jul 2012 15:31:52 +0000 (17:31 +0200)
commitde195d66776b36843b2066da98a9f96ee190ccc3
treedf157472f016bd92fce55fcd5cbb3aab2feeda68
parent0994ab98f17221a26a4b307f6b677660ccec94f1
parentb3efaa1dea74592dd39854321b2a6daef407bd95
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel