From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 25 Sep 2011 17:47:23 +0000 (+0100)
Subject: Merge branch 'nagbar-wrap' into next
X-Git-Tag: 4.1~136
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=18691b68386644e35dadeb1a3f69c22e48b752d6;p=i3%2Fi3

Merge branch 'nagbar-wrap' into next
---

18691b68386644e35dadeb1a3f69c22e48b752d6