From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 23 Aug 2011 23:18:55 +0000 (+0200)
Subject: Merge branch 'i3bar-systray' into next
X-Git-Tag: 4.1~209
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f028a72b85d22918415dab64d5365d6f1e82922;p=i3%2Fi3

Merge branch 'i3bar-systray' into next
---

1f028a72b85d22918415dab64d5365d6f1e82922