From: pk910 <philipp@zoelle1.de>
Date: Mon, 7 Jan 2013 19:54:30 +0000 (+0100)
Subject: Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=e811836d2d5583185347c5ed48aefa573d9bc881;hp=67ca3b7a93dbaeada0376c704760c5326757c66a;p=srvx.git

Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ

Conflicts:
	src/mod-hostserv.c
---