From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 4 Aug 2012 14:09:46 +0000 (+0200)
Subject: Merge branch 'fix-coords'
X-Git-Tag: 4.3~142^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c5cfe22511a1749b99cbfe92d98ff10f8339dc07;p=i3%2Fi3

Merge branch 'fix-coords'
---

c5cfe22511a1749b99cbfe92d98ff10f8339dc07