From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 29 Mar 2015 15:46:37 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.10.1~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6d94231f745bfa9c85c8cec8bf862cdfcc8a07d7;p=i3%2Fi3

Merge branch 'master' into next
---

6d94231f745bfa9c85c8cec8bf862cdfcc8a07d7