Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 5 May 2015 21:20:28 +0000 (23:20 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 5 May 2015 21:20:28 +0000 (23:20 +0200)
commit1d738ab06a5394f604de22f816b87efaa6f2563a
tree50e7a1e0077d5afab001cab9301fd4b341d88652
parentf2e5d296098eb72c5525e26a8e191c539d6fd4c9
parent6420052874cd23030b27457c1245b1bf54468e01
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel