From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 14 Apr 2013 20:54:36 +0000 (+0200)
Subject: Merge branch 'fix-tray-output'
X-Git-Tag: 4.6~45^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=412b15b6b8617a5a705b38559f8767554b6fb81c;p=i3%2Fi3

Merge branch 'fix-tray-output'
---

412b15b6b8617a5a705b38559f8767554b6fb81c