From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 7 Aug 2013 19:13:41 +0000 (+0200)
Subject: Merge branch 'release-4.6' into next
X-Git-Tag: 4.7~77
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4d2785da68aca22b46191fa163ab2922e048f3aa;p=i3%2Fi3

Merge branch 'release-4.6' into next
---

4d2785da68aca22b46191fa163ab2922e048f3aa