From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 13 Jan 2014 22:35:22 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.8~146
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cd0cd0c3d22d7acba240ca10d8594621cc67ee34;p=i3%2Fi3

Merge branch 'master' into next
---

cd0cd0c3d22d7acba240ca10d8594621cc67ee34