Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 28 Aug 2011 07:49:19 +0000 (07:49 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 28 Aug 2011 07:49:19 +0000 (07:49 +0000)
commit7e6776db7e19e152f13599325daf51ac3b5e438a
treed2b4a33165eb85a03b686338721e364a4e2eda7a
parentf5a60ae1d668248eef51db287d954e14a960eda2
parent27547558109f4be7792966f9c9967fdbaa9aa027
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel