From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 22 Jul 2012 19:25:53 +0000 (+0200)
Subject: Merge branch 'fix-resize-retcode'
X-Git-Tag: 4.3~173^2
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=fbff593f1e84f44a1ee08be4b25f0f12e40b847c

Merge branch 'fix-resize-retcode'
---

fbff593f1e84f44a1ee08be4b25f0f12e40b847c