From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 28 Nov 2011 23:28:03 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~211
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=752b1019162b13ac9975634d5974ebd1f34c14a5;p=i3%2Fi3

Merge branch 'master' into next
---

752b1019162b13ac9975634d5974ebd1f34c14a5