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

Merge branch 'master' into next
---

61418f4dfb2a8b3aa1b9568a54e960c8aad09332