Merge pull request #7 from Watcom/master

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

Fri, 3 Apr 2015 21:45:40 +0000 (14:45 -0700)

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

Fri, 3 Apr 2015 21:45:40 +0000 (14:45 -0700)
author Michael Stapelberg <stapelberg@users.noreply.github.com>
Fri, 3 Apr 2015 21:45:40 +0000 (14:45 -0700)
committer Michael Stapelberg <stapelberg@users.noreply.github.com>
Fri, 3 Apr 2015 21:45:40 +0000 (14:45 -0700)
diff --cc i3status.c
Simple merge
diff --cc include/i3status.h
Simple merge
diff --cc man/i3status.man
Simple merge
author	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Fri, 3 Apr 2015 21:45:40 +0000 (14:45 -0700)
committer	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Fri, 3 Apr 2015 21:45:40 +0000 (14:45 -0700)
		1	2
i3status.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/i3status.h	patch \|	diff1 \|	diff2 \|	blob \| history
man/i3status.man	patch \|	diff1 \|	diff2 \|	blob \| history