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

Merge branch 'master' into next
---

20cc9cfe703c8cbc796fe15fdf93c78323836f23