From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 15 Jun 2014 17:14:36 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: 4.9~96^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=34f6f185bfe9476801e6ef45114197becefb0b21;p=i3%2Fi3

Merge branch 'next'
---

34f6f185bfe9476801e6ef45114197becefb0b21