From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 26 Aug 2011 21:33:40 +0000 (+0200)
Subject: Merge branch 'fix-yajl-warning' into next
X-Git-Tag: 4.1~188
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4cb95b3ab3170caa67ae041e41d26f929aafa595;p=i3%2Fi3

Merge branch 'fix-yajl-warning' into next
---

4cb95b3ab3170caa67ae041e41d26f929aafa595