From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 7 Mar 2015 19:26:29 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.10.1~74
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7270f6e96fc4cd75859fd48dc80bcb8902ae1614;p=i3%2Fi3

Merge branch 'master' into next
---

7270f6e96fc4cd75859fd48dc80bcb8902ae1614