From: Felix Dörre <felix@dogcraft.de>
Date: Tue, 27 Sep 2016 23:21:32 +0000 (+0200)
Subject: Merge branch 'libs/json/local'
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=a57cede7c8b013b2578243c422f903b986ee8bd3

Merge branch 'libs/json/local'

Change-Id: Ie68cd2871a8abba4386d089f25da628ba69335cc
---

a57cede7c8b013b2578243c422f903b986ee8bd3