Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 29 Apr 2011 10:14:36 +0000 (10:14 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 29 Apr 2011 10:14:36 +0000 (10:14 +0000)
commitc8e4059cae8c4464db08a0fb8cbbb41e6e6cb5f7
treea2a383b654ad860f30c65054e70e8688946acf5c
parent5003203a0820be8749dcd9c58bac2998a186a308
parentd54ae4059c5395e21f1a0787b98b5fe245251fe6
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel