Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 5 Jan 2012 20:41:37 +0000 (21:41 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 5 Jan 2012 20:41:37 +0000 (21:41 +0100)
commit20f386fa836709f3165102c34e113668ab73094a
tree846c467a5e9e744238c2a8bc19daeedfeabc992d
parent09d85563ff6be31ab572d10fc230cc4f04e7138f
parenta775f93b57d0682525188c01bb0e8d60ed972453
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel