From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 1 Sep 2013 11:35:19 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.7~64
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a52b5212ea5093ee3cb1bc5a191bb3f85ddbb93d;p=i3%2Fi3

Merge branch 'master' into next
---

a52b5212ea5093ee3cb1bc5a191bb3f85ddbb93d