From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 27 Jan 2013 19:20:53 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.5~32
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3e59a8c949089f42f914beb790cd489ea18e42e8;p=i3%2Fi3

Merge branch 'master' into next
---

3e59a8c949089f42f914beb790cd489ea18e42e8