From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 27 Jun 2013 22:14:30 +0000 (+0200)
Subject: Merge branch 'fix-nagbar'
X-Git-Tag: 4.6~14^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=32e2180b56a82ed7373e4af8fc5cbf5977f3de5b;p=i3%2Fi3

Merge branch 'fix-nagbar'
---

32e2180b56a82ed7373e4af8fc5cbf5977f3de5b