From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 24 Jun 2014 07:57:05 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~88
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b91cd347e4a40d6d160cb74f1adf61bb7bb9a2bc;p=i3%2Fi3

Merge branch 'master' into next
---

b91cd347e4a40d6d160cb74f1adf61bb7bb9a2bc