From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 24 Sep 2012 21:59:30 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.4~110
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0aa306890b66047aacb4863df0cfdfd6f46361e6;p=i3%2Fi3

Merge branch 'master' into next
---

0aa306890b66047aacb4863df0cfdfd6f46361e6