Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ
authorpk910 <philipp@zoelle1.de>
Mon, 7 Jan 2013 19:54:30 +0000 (20:54 +0100)
committerpk910 <philipp@zoelle1.de>
Mon, 7 Jan 2013 19:54:30 +0000 (20:54 +0100)
commite811836d2d5583185347c5ed48aefa573d9bc881
tree93dfe3a083053396e20c671dda9c04dba65b01ef
parent67ca3b7a93dbaeada0376c704760c5326757c66a
parent3086ecdc28011672558fcaaa15c885cdd23b7a29
Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ

Conflicts:
src/mod-hostserv.c