From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 16 Jul 2012 17:24:33 +0000 (+0200)
Subject: Merge branch 'fix-yajl1-warnings'
X-Git-Tag: 4.3~191^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=167b38b18401ffeb8c975e66d9a15bec912158f5;p=i3%2Fi3

Merge branch 'fix-yajl1-warnings'
---

167b38b18401ffeb8c975e66d9a15bec912158f5