From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 22 Dec 2013 20:14:21 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Tag: 4.7.1~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=28939365cb2371f0c2374ec6546f751ff0f42350;p=i3%2Fi3

Merge branch 'next'
---

28939365cb2371f0c2374ec6546f751ff0f42350