From: Felix Morgner <felix.morgner@gmail.com>
Date: Thu, 22 May 2014 16:20:46 +0000 (+0200)
Subject: Merge branch 'ipv6' of github.com:fmorgner/umurmur into ipv6
X-Git-Url: http://git.code-monkey.de/?a=commitdiff_plain;h=676d49d2b2975c49bf80d62bf4a76301d0e22e57;hp=676d49d2b2975c49bf80d62bf4a76301d0e22e57;p=umurmur.git

Merge branch 'ipv6' of github.com:fmorgner/umurmur into ipv6

Conflicts:
	src/client.c
	src/server.c
---