From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 27 Aug 2013 18:23:00 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.7~66
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1a7fe4ee79dd707d33832c672c8e1c5a5619b983;p=i3%2Fi3

Merge branch 'master' into next
---

1a7fe4ee79dd707d33832c672c8e1c5a5619b983