From: Felix Dörre <felix@dogcraft.de>
Date: Thu, 30 Jun 2016 15:47:04 +0000 (+0200)
Subject: Merge branch 'libs/jetty/local'
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=aa5723dbb64ec8efa63909d39ff72364f0a5ee96

Merge branch 'libs/jetty/local'

Change-Id: Ibdf6d6246cc33a319462381643cf059bf5b7bc70
---

aa5723dbb64ec8efa63909d39ff72364f0a5ee96