From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 26 Nov 2011 21:30:44 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~218
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=67c2c03f7621c215c30b1558b65367148181fd07;p=i3%2Fi3

Merge branch 'master' into next
---

67c2c03f7621c215c30b1558b65367148181fd07