Merge pull request #1771 from Airblader/feature-1769

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

Tue, 30 Jun 2015 20:52:54 +0000 (13:52 -0700)

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

Tue, 30 Jun 2015 20:52:54 +0000 (13:52 -0700)
author Michael Stapelberg <stapelberg@users.noreply.github.com>
Tue, 30 Jun 2015 20:52:54 +0000 (13:52 -0700)
committer Michael Stapelberg <stapelberg@users.noreply.github.com>
Tue, 30 Jun 2015 20:52:54 +0000 (13:52 -0700)
diff --cc src/commands.c
Simple merge
diff --cc src/config_directives.c
Simple merge
author	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Tue, 30 Jun 2015 20:52:54 +0000 (13:52 -0700)
committer	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Tue, 30 Jun 2015 20:52:54 +0000 (13:52 -0700)
		1	2
src/commands.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/config_directives.c	patch \|	diff1 \|	diff2 \|	blob \| history