Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 4 Nov 2012 13:24:30 +0000 (14:24 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 4 Nov 2012 13:24:30 +0000 (14:24 +0100)
commit5578df35fc68eaf4ffde10c3848b72f4aab3899b
tree1cce0fe6da914df9d22ecd13b85aec056858294f
parentb7f1665b64318cee1b14d13f7e9fdb6a323189a4
parentd03b8576be0833160cab117bc499a056e7d565f2
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel