From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 19 Sep 2012 16:12:35 +0000 (+0200)
Subject: Merge branch 'release-4.3' into next
X-Git-Tag: 4.4~157
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7215ac54dd4c7c301ec20559250c89e78055257;p=i3%2Fi3

Merge branch 'release-4.3' into next
---

d7215ac54dd4c7c301ec20559250c89e78055257