From: pk910 <philipp@zoelle1.de>
Date: Wed, 27 Feb 2013 20:17:17 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=f9849091bad2f9af7c7eb38c147144c74c534c5d;hp=6581a4797de9bf410a06c70b3d586fd842365c99

Merge branch 'master'

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