Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 3 Jan 2015 20:34:06 +0000 (21:34 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 3 Jan 2015 20:34:06 +0000 (21:34 +0100)
commit7fe2f3119b5dd533fe65e84a291719cb2992db94
tree5c608074138d322439da48c77cee7e40fb1f0f4f
parent8b452cfd0e2dc28052c674be0d79b59bc6b08f0b
parent4f4a70c228427c360d73b5ec1fd5f0726bc20e89
Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel