Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 10 May 2014 09:09:09 +0000 (11:09 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 10 May 2014 09:09:09 +0000 (11:09 +0200)
commitc4452ae9b7277709d61ab2a8cf0a8a0d01fa9c5b
treeff6453da7723bfcee7e41d07ed33d7726595f243
parenta9e34f4f21db2a290905929e6221eb5aa79f0192
parent9909bb96149ebcaa88894be071230234f289be14
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel