Merge branch 'libs/jetty/local'
authorFelix Dörre <felix@dogcraft.de>
Thu, 30 Jun 2016 15:47:04 +0000 (17:47 +0200)
committerFelix Dörre <felix@dogcraft.de>
Thu, 30 Jun 2016 15:47:53 +0000 (17:47 +0200)
commitaa5723dbb64ec8efa63909d39ff72364f0a5ee96
treefc5309f2330f5a2d8752fa61f97483ef8d1ea098
parente443f19911df6a30ab07ef70d23970bda671b194
parent065ca60170f2471227dc25784e1a4c3b7912d367
Merge branch 'libs/jetty/local'

Change-Id: Ibdf6d6246cc33a319462381643cf059bf5b7bc70