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

Merge branch 'release-4.10'
---

33069ff1d548947003bf8dc780d74dbcd91ea7f9