Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 28 Jul 2011 12:15:36 +0000 (12:15 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 28 Jul 2011 12:15:36 +0000 (12:15 +0000)
commita1ba09ef9d23f1f047cec4b17ae0a3b88c01979d
treed9d7dda55587fc3ccba223a16a5cfcfa73e99993
parent122b70caf393ffeddae7c3e7ae7ce923f4ede7d0
parent0daa6aae0a4cfde739bdeb0c1ad81ad5bfc2884c
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel