From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 10 Jul 2012 20:53:36 +0000 (+0200)
Subject: Merge branch 'i3bar-tray'
X-Git-Tag: 4.3~193^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9b74f2de11e477e5d9d010a96e9af49690ae56d1;p=i3%2Fi3

Merge branch 'i3bar-tray'
---

9b74f2de11e477e5d9d010a96e9af49690ae56d1