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

Merge branch 'next' into master
---

8629c2e208930414f542435509594df051be2009