From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 29 Jun 2013 21:47:29 +0000 (+0200)
Subject: Merge branch 'fix-nagbar-without-font'
X-Git-Tag: 4.6~9^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8a7a80e22e14882a8b41bb2ff0979534426bcf0e;p=i3%2Fi3

Merge branch 'fix-nagbar-without-font'
---

8a7a80e22e14882a8b41bb2ff0979534426bcf0e