From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 18 May 2012 07:14:38 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~224
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d154d347ece8984d79597025c88dcc25f1eded1c;p=i3%2Fi3

Merge branch 'master' into next
---

d154d347ece8984d79597025c88dcc25f1eded1c