From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 4 Sep 2012 20:49:12 +0000 (+0200)
Subject: Merge branch 'fix-1px-flickering'
X-Git-Tag: 4.3~43^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ada6af424400daf1490e4327b2fa5ea0baa4795b;p=i3%2Fi3

Merge branch 'fix-1px-flickering'
---

ada6af424400daf1490e4327b2fa5ea0baa4795b