Merge branch 't/abrahamsson-fd_server-ipv6'
commit4dca6f9b21712a57609bcd7aa5c11957bb02a254
authorMichael Gebetsroither <michael@mgeb.org>
Thu, 19 Nov 2015 15:06:43 +0000 (19 16:06 +0100)
committerMichael Gebetsroither <michael@mgeb.org>
Thu, 19 Nov 2015 15:06:43 +0000 (19 16:06 +0100)
tree409f04a0eb8ed1eb54f5b0d8c255ea68b62ed8c8
parentc0fede4027b712f20137118680408d547ec05897
parent4f7b0d11aa7802622b88f5ad2517e751b5af6a42
Merge branch 't/abrahamsson-fd_server-ipv6'