Merge pull request #2887 from orestisf1993/next

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

Fri, 15 Sep 2017 19:26:35 +0000 (21:26 +0200)

committer GitHub <noreply@github.com>

Fri, 15 Sep 2017 19:26:35 +0000 (21:26 +0200)
author Ingo Bürk <admin@airblader.de>
Fri, 15 Sep 2017 19:26:35 +0000 (21:26 +0200)
committer GitHub <noreply@github.com>
Fri, 15 Sep 2017 19:26:35 +0000 (21:26 +0200)
diff --cc docs/userguide
Simple merge
diff --cc include/data.h
Simple merge
diff --cc src/manage.c
Simple merge
author	Ingo Bürk <admin@airblader.de>
	Fri, 15 Sep 2017 19:26:35 +0000 (21:26 +0200)
committer	GitHub <noreply@github.com>
	Fri, 15 Sep 2017 19:26:35 +0000 (21:26 +0200)
		1	2
docs/userguide	patch \|	diff1 \|	diff2 \|	blob \| history
include/data.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/manage.c	patch \|	diff1 \|	diff2 \|	blob \| history