From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 18 Dec 2011 15:19:09 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~178
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2ba09f54197b4bd67d9e5a79afee09919508de93;p=i3%2Fi3

Merge branch 'master' into next
---

2ba09f54197b4bd67d9e5a79afee09919508de93