Merge pull request #1698 from Airblader/feature-1696

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

Sun, 17 May 2015 13:02:50 +0000 (15:02 +0200)

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

Sun, 17 May 2015 13:02:50 +0000 (15:02 +0200)
author Michael Stapelberg <stapelberg@users.noreply.github.com>
Sun, 17 May 2015 13:02:50 +0000 (15:02 +0200)
committer Michael Stapelberg <stapelberg@users.noreply.github.com>
Sun, 17 May 2015 13:02:50 +0000 (15:02 +0200)
diff --cc docs/userguide
Simple merge
diff --cc src/commands.c
Simple merge
author	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Sun, 17 May 2015 13:02:50 +0000 (15:02 +0200)
committer	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Sun, 17 May 2015 13:02:50 +0000 (15:02 +0200)
		1	2
docs/userguide	patch \|	diff1 \|	diff2 \|	blob \| history
src/commands.c	patch \|	diff1 \|	diff2 \|	blob \| history