From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 Sep 2015 06:55:24 +0000 (+0200)
Subject: Merge branch 'next' into master
X-Git-Tag: 4.14.1~104
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=96e1b80371b985d4f67b36e6cb48e61b5fb83995;p=i3%2Fi3

Merge branch 'next' into master
---

96e1b80371b985d4f67b36e6cb48e61b5fb83995