From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 7 Mar 2015 10:47:59 +0000 (+0100)
Subject: Merge branch 'revert-iconic'
X-Git-Tag: 4.9.1~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a88cdf4ba721137e8c27acb32448503a451848de;p=i3%2Fi3

Merge branch 'revert-iconic'
---

a88cdf4ba721137e8c27acb32448503a451848de