Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 28 Nov 2013 21:55:42 +0000 (22:55 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 28 Nov 2013 21:55:42 +0000 (22:55 +0100)
commitb68b9e9de02918b32e95043cb7d18588cea4af0f
treefe93b93e995c83cd652a4f09493f022a1e07fa46
parent622352146e370d1db21bc9ef87ccf28ba34a4f10
parent6ae0819ac13984a0dfa583281fc0081af735c77d
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel