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)
Change-Id: Ibdf6d6246cc33a319462381643cf059bf5b7bc70


Trivial merge