Michael Stapelberg cc2fda9242 Merge branch 'master' into next ...

Conflicts:
	debian/changelog

2012-01-27 19:56:58 +00:00

..

patches

…

changelog

Merge branch 'master' into next

2012-01-27 19:56:58 +00:00

compat

…

control

…

copyright

…

i3-wm.doc-base

…

i3-wm.docs

…

i3-wm.manpages

…

i3-wm.wm

…

rules

…

watch

…