Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 5 Aug 2012 11:51:00 +0000 (13:51 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 5 Aug 2012 11:51:00 +0000 (13:51 +0200)
commit7555d277f2ccfa8d3f484e5e1dc76e64284afe11
treecf5eee0c2cb1d453dda068d57571cb2214131a0e
parent7eca3d70c39d2b902f5bc28d16bfd7b017596be3
parentc40b7cf4df97b7212cae742d3e22d51249d525bf
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
citadel/citserver.c