From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 26 Aug 2011 01:24:10 +0000 (+0200)
Subject: Merge branch 'fix-warning'
X-Git-Tag: 4.0.2~17
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed6f5d214c3395ad5e55f003fb06c6b69f18bb9a;p=i3%2Fi3

Merge branch 'fix-warning'
---

ed6f5d214c3395ad5e55f003fb06c6b69f18bb9a