Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 6 Apr 2011 22:47:01 +0000 (00:47 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 6 Apr 2011 22:47:01 +0000 (00:47 +0200)
commitb0f6f109ffc8efc9e11cd594b55e85ead4eb9e40
tree2d32b323e84fb79c11e46364205b189a37ddc4d4
parent46b3b59bc9d044e4a28d603394638418f6567d83
parentd0e228da80320882467837b42fa1bac074606660
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel