From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 Nov 2011 20:10:45 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~206
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=fb90a556c88027b2ba639037bacb55770414a4e2

Merge branch 'master' into next
---

fb90a556c88027b2ba639037bacb55770414a4e2