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)
1  2 
citadel/citserver.c

Simple merge