Merge branch 'master' into status

author Bastien Dejean <nihilhill@gmail.com>

Tue, 18 Dec 2012 11:44:05 +0000 (12:44 +0100)

committer Bastien Dejean <nihilhill@gmail.com>

Tue, 18 Dec 2012 11:44:05 +0000 (12:44 +0100)
author Bastien Dejean <nihilhill@gmail.com>
Tue, 18 Dec 2012 11:44:05 +0000 (12:44 +0100)
committer Bastien Dejean <nihilhill@gmail.com>
Tue, 18 Dec 2012 11:44:05 +0000 (12:44 +0100)
diff --cc README.md
Simple merge
diff --cc bspwm.1
Simple merge
author	Bastien Dejean <nihilhill@gmail.com>
	Tue, 18 Dec 2012 11:44:05 +0000 (12:44 +0100)
committer	Bastien Dejean <nihilhill@gmail.com>
	Tue, 18 Dec 2012 11:44:05 +0000 (12:44 +0100)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
bspwm.1	patch \|	diff1 \|	diff2 \|	blob \| history