Merge pull request #2496 from Airblader/feature-917

author Michael Stapelberg <stapelberg@users.noreply.github.com>

Mon, 15 May 2017 19:35:10 +0000 (21:35 +0200)

committer GitHub <noreply@github.com>

Mon, 15 May 2017 19:35:10 +0000 (21:35 +0200)
author Michael Stapelberg <stapelberg@users.noreply.github.com>
Mon, 15 May 2017 19:35:10 +0000 (21:35 +0200)
committer GitHub <noreply@github.com>
Mon, 15 May 2017 19:35:10 +0000 (21:35 +0200)
diff --cc docs/userguide
Simple merge
diff --cc src/bindings.c
Simple merge
diff --cc src/con.c
Simple merge
author	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Mon, 15 May 2017 19:35:10 +0000 (21:35 +0200)
committer	GitHub <noreply@github.com>
	Mon, 15 May 2017 19:35:10 +0000 (21:35 +0200)
		1	2
docs/userguide	patch \|	diff1 \|	diff2 \|	blob \| history
src/bindings.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/con.c	patch \|	diff1 \|	diff2 \|	blob \| history