From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 15 Jun 2014 17:14:25 +0000 (+0200)
Subject: Merge branch 'release-4.8' into next
X-Git-Tag: 4.9~119
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f30c0a4fc7df8512e811807903e310cfe68bfaab;p=i3%2Fi3

Merge branch 'release-4.8' into next
---

f30c0a4fc7df8512e811807903e310cfe68bfaab