From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 23 Jul 2014 07:48:26 +0000 (+0200)
Subject: Merge branch 'fix-decoration'
X-Git-Tag: 4.9~64^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a62bb17511949dbc6880763360dd2a530ec70866;p=i3%2Fi3

Merge branch 'fix-decoration'
---

a62bb17511949dbc6880763360dd2a530ec70866