From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 21 Jan 2014 18:22:43 +0000 (+0100)
Subject: Merge branch 'release-4.7.1' into next
X-Git-Tag: 4.8~141
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b0990c183ae1e25aaddb2af40eeb11eff1a208af;p=i3%2Fi3

Merge branch 'release-4.7.1' into next
---

b0990c183ae1e25aaddb2af40eeb11eff1a208af