From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 8 Aug 2013 20:44:30 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.7~73
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cc36c94b6039e2160a901c2c4f4d5b7bda648746;p=i3%2Fi3

Merge branch 'master' into next
---

cc36c94b6039e2160a901c2c4f4d5b7bda648746