From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 29 Nov 2011 21:24:05 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~209
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=f2b73b64beee5831a5def220a951fe8e90fca195

Merge branch 'master' into next
---

f2b73b64beee5831a5def220a951fe8e90fca195