From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 22 Apr 2012 18:11:07 +0000 (+0200)
Subject: Merge branch 'fix-i3bar-dying-tray'
X-Git-Tag: 4.2~12^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=75720fa88e1a149784d18ee89b72c8f3d2a1d8e2;p=i3%2Fi3

Merge branch 'fix-i3bar-dying-tray'
---

75720fa88e1a149784d18ee89b72c8f3d2a1d8e2