Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 11 Jun 2012 20:25:00 +0000 (22:25 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 11 Jun 2012 20:25:00 +0000 (22:25 +0200)
commit5816b80c48d0b906919377c4f4e477da15f02431
treea1ada323016e4c00e8d25153d2314ad941d04bcf
parent8ffb37bf859b810c6f3c0895d1cd2edba32e54bf
parent8f7d437eb6a5232f9cfa7b0c6c0ac89ca964924f
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel