From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 31 Jan 2015 21:56:08 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3f126c61c409550c9af080a9813de9480ae0eaf7;p=i3%2Fi3

Merge branch 'master' into next
---

3f126c61c409550c9af080a9813de9480ae0eaf7