From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 29 Mar 2015 17:07:24 +0000 (+0200)
Subject: Merge branch 'release-4.10.1'
X-Git-Tag: 4.10.2~5^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9cf0150fa1d8f454dcc5742d8e844ee22538f116;p=i3%2Fi3

Merge branch 'release-4.10.1'
---

9cf0150fa1d8f454dcc5742d8e844ee22538f116