From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 23 Jan 2014 21:53:21 +0000 (+0100)
Subject: Merge branch 'release-4.7.2'
X-Git-Tag: 4.8~135^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da12c9f591f936c17dbdbe7a3f8f46bdafaf7476;p=i3%2Fi3

Merge branch 'release-4.7.2'
---

da12c9f591f936c17dbdbe7a3f8f46bdafaf7476