From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 27 Sep 2012 10:10:14 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.4~108
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dcf95fd312c5cf9af2309163dc04740e64baad0d;p=i3%2Fi3

Merge branch 'master' into next
---

dcf95fd312c5cf9af2309163dc04740e64baad0d