From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 24 Sep 2013 05:48:09 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.7~53
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=031de8f720f89e04cd8700fc7f44a369be7a2d9d;p=i3%2Fi3

Merge branch 'master' into next
---

031de8f720f89e04cd8700fc7f44a369be7a2d9d