From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 21 Dec 2013 20:32:55 +0000 (+0100)
Subject: Merge branch 'fix-active'
X-Git-Tag: 4.7~1^2
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=95af0fdcac564b16fcf687d5a0401dce098436ba

Merge branch 'fix-active'
---

95af0fdcac564b16fcf687d5a0401dce098436ba