From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 24 Aug 2011 13:14:50 +0000 (+0200)
Subject: Merge branch 'fix-resize-in-con'
X-Git-Tag: 4.0.2~31
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=63fff5a4e121a880604b4b134fdcb8ae3c523428;p=i3%2Fi3

Merge branch 'fix-resize-in-con'
---

63fff5a4e121a880604b4b134fdcb8ae3c523428