From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 24 Dec 2012 13:50:15 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.5~95
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1a6bddad55b87f6d1e23ab05c1abc4da1e843a21;p=i3%2Fi3

Merge branch 'master' into next
---

1a6bddad55b87f6d1e23ab05c1abc4da1e843a21