From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 28 Feb 2015 14:02:21 +0000 (+0100)
Subject: Merge branch 'release-4.9' into next
X-Git-Tag: 4.9.1~10^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=31ea3ecc38e27e85d0695c12ac3c10e83b13122e;p=i3%2Fi3

Merge branch 'release-4.9' into next
---

31ea3ecc38e27e85d0695c12ac3c10e83b13122e