Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 30 Jun 2014 19:58:44 +0000 (21:58 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 30 Jun 2014 19:58:44 +0000 (21:58 +0200)
commit489820aa544023dba04463b8474a22ff78ced029
tree551282ad42a0a09574da645f5f30f92e0cf61808
parent938d37582253fe448b0c5cc21b6e9ce3faf85048
parenta1569587b8bb37d938d476ed6010e28b310a1f68
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel