From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 22 Dec 2013 20:14:15 +0000 (+0100)
Subject: Merge branch 'release-4.7' into next
X-Git-Tag: 4.7.1~7^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ae0e83f08d9d2691db4bb5cf26231e39417750ca;p=i3%2Fi3

Merge branch 'release-4.7' into next
---

ae0e83f08d9d2691db4bb5cf26231e39417750ca