Merge pull request #2143 from Airblader/feature-2120

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

Tue, 5 Jan 2016 21:32:15 +0000 (22:32 +0100)

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

Tue, 5 Jan 2016 21:32:15 +0000 (22:32 +0100)
author Michael Stapelberg <stapelberg@users.noreply.github.com>
Tue, 5 Jan 2016 21:32:15 +0000 (22:32 +0100)
committer Michael Stapelberg <stapelberg@users.noreply.github.com>
Tue, 5 Jan 2016 21:32:15 +0000 (22:32 +0100)
diff --cc docs/userguide
Simple merge
diff --cc src/x.c
Simple merge
author	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Tue, 5 Jan 2016 21:32:15 +0000 (22:32 +0100)
committer	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Tue, 5 Jan 2016 21:32:15 +0000 (22:32 +0100)
		1	2
docs/userguide	patch \|	diff1 \|	diff2 \|	blob \| history
src/x.c	patch \|	diff1 \|	diff2 \|	blob \| history