From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 29 Aug 2011 13:17:50 +0000 (+0200)
Subject: Merge branch 'fix-borderless'
X-Git-Tag: 4.1~173^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=04a886e4eefdd239c271afa59b0ef579e5e03a55;p=i3%2Fi3

Merge branch 'fix-borderless'
---

04a886e4eefdd239c271afa59b0ef579e5e03a55