Merge pull request #161 from slokhorst/rpc-ipv6

author Mike Gelfand <mikedld@users.noreply.github.com>

Mon, 1 May 2017 10:31:14 +0000 (13:31 +0300)

committer GitHub <noreply@github.com>

Mon, 1 May 2017 10:31:14 +0000 (13:31 +0300)
author Mike Gelfand <mikedld@users.noreply.github.com>
Mon, 1 May 2017 10:31:14 +0000 (13:31 +0300)
committer GitHub <noreply@github.com>
Mon, 1 May 2017 10:31:14 +0000 (13:31 +0300)
diff --cc daemon/daemon.c
Simple merge
diff --cc libtransmission/rpc-server.c
Simple merge
author	Mike Gelfand <mikedld@users.noreply.github.com>
	Mon, 1 May 2017 10:31:14 +0000 (13:31 +0300)
committer	GitHub <noreply@github.com>
	Mon, 1 May 2017 10:31:14 +0000 (13:31 +0300)
		1	2
daemon/daemon.c	patch \|	diff1 \|	diff2 \|	blob \| history
libtransmission/rpc-server.c	patch \|	diff1 \|	diff2 \|	blob \| history