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

Merge branch 'master' into next
---

2ea94420d31fd45a7c9cfa2301652f3ba1aef84a