From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 9 Oct 2011 12:52:05 +0000 (+0100)
Subject: Merge branch 'i3bar-tray-size' into next
X-Git-Tag: 4.1~113
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ea89cf179a22090034eedc14f9d47e8b748bc8f2;p=i3%2Fi3

Merge branch 'i3bar-tray-size' into next
---

ea89cf179a22090034eedc14f9d47e8b748bc8f2