Merge branch 'master'
authorpk910 <philipp@zoelle1.de>
Wed, 27 Feb 2013 20:17:17 +0000 (21:17 +0100)
committerpk910 <philipp@zoelle1.de>
Wed, 27 Feb 2013 20:17:17 +0000 (21:17 +0100)
commitf9849091bad2f9af7c7eb38c147144c74c534c5d
tree5fd33df9959fcbe4a64eab8efb6c216b21b0adca
parent6581a4797de9bf410a06c70b3d586fd842365c99
parent9a194863f5519a0afc587271ce404c01c50c434e
Merge branch 'master'

Conflicts:
src/mod-hostserv.c