From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 9 May 2012 18:06:45 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~230
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1c0b542c07546532b6d09c5805db478a96af10b5;p=i3%2Fi3

Merge branch 'master' into next
---

1c0b542c07546532b6d09c5805db478a96af10b5