From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 25 Jun 2014 08:00:59 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~87
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e594086757d4d79cdfb963b1e5911bc37c34cade;p=i3%2Fi3

Merge branch 'master' into next
---

e594086757d4d79cdfb963b1e5911bc37c34cade