From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 1 Mar 2015 15:50:49 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.10.1~84
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0876bd621f91fdb8d7e7c649e6a6973accb9c95b;p=i3%2Fi3

Merge branch 'master' into next
---

0876bd621f91fdb8d7e7c649e6a6973accb9c95b