From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 29 Jun 2013 17:28:41 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.6~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6582da993948c392daeaf4be018546e9186effb0;p=i3%2Fi3

Merge branch 'master' into next
---

6582da993948c392daeaf4be018546e9186effb0