From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 16 Apr 2015 07:03:28 +0000 (+0200)
Subject: Merge branch 'release-4.10.2'
X-Git-Tag: 4.10.3~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c0dbc5dd77388f79f1ebfe233398b9f44e43fd2a;p=i3%2Fi3

Merge branch 'release-4.10.2'
---

c0dbc5dd77388f79f1ebfe233398b9f44e43fd2a