From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 25 Jan 2013 12:56:26 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.5~46
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c2061042e14f2d8f79b807fd36d79d6d9554804e;p=i3%2Fi3

Merge branch 'master' into next
---

c2061042e14f2d8f79b807fd36d79d6d9554804e