From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 28 Feb 2015 14:02:31 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Tag: 4.9.1~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fe482cf193b56c9a2f7fffc7dd2e943fda42061d;p=i3%2Fi3

Merge branch 'next'
---

fe482cf193b56c9a2f7fffc7dd2e943fda42061d