From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 30 Aug 2013 18:01:04 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.7~65
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=599a4d48e61c9f4293069cdbe8aee245339b8f2d;p=i3%2Fi3

Merge branch 'master' into next
---

599a4d48e61c9f4293069cdbe8aee245339b8f2d