Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 9 Feb 2012 21:51:16 +0000 (22:51 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 9 Feb 2012 21:51:16 +0000 (22:51 +0100)
commit91238fd122152d8127d2b6974ecec24b08fe26c5
tree8ee870149c577ee0b7a6dd7a235405a4d9ce4047
parent8bfe7498818fed3f6e0e0c8d228662706bcf8ae5
parent20524787ef32996d36ddbcfbca8648328865dad2
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel