Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 16 Jul 2012 16:21:37 +0000 (18:21 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 16 Jul 2012 16:21:37 +0000 (18:21 +0200)
commit507476eab3402b0b111f58ae52b3826cdff80703
tree622478b308231c5c8abedd295b3c34d8b5cdd98f
parent884345d47b9227a303e75f9164d92c81a6e5e590
parentdc4679ebfb997ad5941b5a32b8e0f1fd0488ea68
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel