Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 11 Jan 2015 11:44:49 +0000 (12:44 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 11 Jan 2015 11:44:49 +0000 (12:44 +0100)
commitd7641387790e83fd3a5163202b0fe5f9cc279fe4
tree3cfbc36b027cb8454125094edd7e01dd2d775b70
parent0bb85075081ecab7a189484af2438116982a3030
parent164b2f28587681f406dd12dbc4a3c82e70775726
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel