From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 24 Dec 2013 09:37:14 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.8~178
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5cd7979e62613e1d015f71cb85430abfddc2109f;p=i3%2Fi3

Merge branch 'master' into next
---

5cd7979e62613e1d015f71cb85430abfddc2109f