Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 31 Dec 2014 19:24:52 +0000 (20:24 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 31 Dec 2014 19:24:52 +0000 (20:24 +0100)
commit9530aa5d9ba02e3b186aec0c24a1fa7824b7b086
tree91622d08660c32e109e3ecb8e54af6a7dade1606
parent2b57abb4e89077f1bdf104e95203015810cf1a6f
parent313ec8cd15d8b4b0490862ef294f3aaa6390172c
Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel