From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 7 Feb 2012 22:42:58 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~88
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed2bcc15e384be99225a247435f6cff678e64f0c;p=i3%2Fi3

Merge branch 'master' into next
---

ed2bcc15e384be99225a247435f6cff678e64f0c