From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 Nov 2011 20:10:42 +0000 (+0000)
Subject: Merge branch 'displayversion'
X-Git-Tag: 4.1.1~21
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5cfea9fad59bb5b0f95b37b65bf660cb82d61fe8;p=i3%2Fi3

Merge branch 'displayversion'
---

5cfea9fad59bb5b0f95b37b65bf660cb82d61fe8