From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 21 Jan 2014 18:23:25 +0000 (+0100)
Subject: Merge branch 'release-4.7.1'
X-Git-Tag: 4.7.2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3d5e6db0bccadc99ea4fe4d8bc6526505939ade6;p=i3%2Fi3

Merge branch 'release-4.7.1'
---

3d5e6db0bccadc99ea4fe4d8bc6526505939ade6