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

Merge branch 'master' into next
---

f7f1ec5dab85e934de8220fb48dee861e1097e35