From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 9 Jan 2013 17:11:17 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.5~58
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fc0e80ee7f94c74a6b9097299870c80f18c8bfe7;p=i3%2Fi3

Merge branch 'master' into next
---

fc0e80ee7f94c74a6b9097299870c80f18c8bfe7