From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 22 Nov 2011 22:08:40 +0000 (+0000)
Subject: Merge branch 'fix-warning'
X-Git-Tag: 4.1.1~32
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e09bb51c14c3b024b6515007482e752cdd6ce4b6;p=i3%2Fi3

Merge branch 'fix-warning'
---

e09bb51c14c3b024b6515007482e752cdd6ce4b6