Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 21 Aug 2012 22:13:45 +0000 (00:13 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 21 Aug 2012 22:13:45 +0000 (00:13 +0200)
commit3ba8f49b0829566a78901afe33291d1cbce336be
tree4fd4e2d86f052e97332a558206498bc0f9840a1d
parente1d43d5e4e749fa7756b324bbb16da561fc45e87
parent4fb9c8db45e0415c795916e15925fd5fa190a454
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel