Merge branch 'master' of git://git.suckless.org/sites - sites

commit 4a4081bf2c9196253688e108e8f919fc2c360ff6
parent 4399516159100d08f5395c93f23f1d888d4c8728
Author: Christoph Lohmann <20h@r-36.net>
Date:   Fri, 31 Jul 2015 15:25:54 +0200

Merge branch 'master' of git://git.suckless.org/sites

Yeah, yeah, I merge the merge.

	sites public wiki contents of suckless.org
	git clone git://git.suckless.org/sites
	Log \| Files \| Refs