From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 9 May 2012 19:08:28 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~227
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed957d60a76480fede5f4efc5c12467718144b03;p=i3%2Fi3

Merge branch 'master' into next
---

ed957d60a76480fede5f4efc5c12467718144b03