From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 24 Aug 2011 22:24:09 +0000 (+0200)
Subject: Merge branch 'fix-deco-1pixel'
X-Git-Tag: 4.0.2~24
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1d6e41e49320c02e402a24f266ce84e97dba8480;p=i3%2Fi3

Merge branch 'fix-deco-1pixel'
---

1d6e41e49320c02e402a24f266ce84e97dba8480