From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 7 Aug 2013 19:13:46 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: 4.7~75^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f682841ae1d7fd0ebde8cd5440fc0c877be37915;p=i3%2Fi3

Merge branch 'next'
---

f682841ae1d7fd0ebde8cd5440fc0c877be37915