Merge branch 'ipv6' of github.com:fmorgner/umurmur into ipv6
authorFelix Morgner <felix.morgner@gmail.com>
Thu, 22 May 2014 16:20:46 +0000 (18:20 +0200)
committerFelix Morgner <felix.morgner@gmail.com>
Thu, 22 May 2014 16:20:46 +0000 (18:20 +0200)
commit676d49d2b2975c49bf80d62bf4a76301d0e22e57
tree71b48bef6085bbe514698d7f16020787ce07e7cb
parente3d75b4d7bddb8db5e1a4fb218cc5f3b236de0cc
parent77e7246bd3a4260da52f74f7fe014131c918d6e4
Merge branch 'ipv6' of github.com:fmorgner/umurmur into ipv6

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