From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 1 Jan 2014 10:10:26 +0000 (+0100)
Subject: Merge branch 'fix-tray-mapped'
X-Git-Tag: 4.7.1~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3ebc6654cde90a66b2560d1ef542270d82b9a5fd;p=i3%2Fi3

Merge branch 'fix-tray-mapped'
---

3ebc6654cde90a66b2560d1ef542270d82b9a5fd