Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ
authorNurPech <nurpech@nurpech.de>
Mon, 7 Jan 2013 18:07:43 +0000 (19:07 +0100)
committerNurPech <nurpech@nurpech.de>
Mon, 7 Jan 2013 18:07:43 +0000 (19:07 +0100)
commit9a7baf0638dac261b1aea690fae5f52caf674812
treebc5ee0d4598713c679e0d40a9586f684eeb89b85
parentb46a65c43cdcb224f39f73e475ca240bcc59328e
parente943c784d37a4b287e58712f4a9db6f5d594b7c4
Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ

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