Merge pull request #2649 from s3rb31/next

author Ingo Bürk <admin@airblader.de>

Thu, 23 Feb 2017 23:58:19 +0000 (00:58 +0100)

committer GitHub <noreply@github.com>

Thu, 23 Feb 2017 23:58:19 +0000 (00:58 +0100)
author Ingo Bürk <admin@airblader.de>
Thu, 23 Feb 2017 23:58:19 +0000 (00:58 +0100)
committer GitHub <noreply@github.com>
Thu, 23 Feb 2017 23:58:19 +0000 (00:58 +0100)
diff --cc docs/userguide
Simple merge
diff --cc src/commands.c
Simple merge
diff --cc src/util.c
Simple merge
author	Ingo Bürk <admin@airblader.de>
	Thu, 23 Feb 2017 23:58:19 +0000 (00:58 +0100)
committer	GitHub <noreply@github.com>
	Thu, 23 Feb 2017 23:58:19 +0000 (00:58 +0100)
		1	2
docs/userguide	patch \|	diff1 \|	diff2 \|	blob \| history
src/commands.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/util.c	patch \|	diff1 \|	diff2 \|	blob \| history