From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Tue, 26 Jan 2016 09:06:27 +0000 (-0800)
Subject: Merge pull request #2177 from dcoppa/next
X-Git-Tag: 4.12~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=de42f9aef35e183d1a7788756c362ecb55148048;p=i3%2Fi3

Merge pull request #2177 from dcoppa/next

Remove commented-out code and fix i3-nagbar manpage
---

de42f9aef35e183d1a7788756c362ecb55148048