tree aad4378caeb6364fce868cbb95414c9e9a382143
parent 1ed327ecceb9ab343b790efe14d23a5efdebaebf
parent 145e4bee7139125408acc7388bf58531e96ae3d7
author Simone Bordet <simone.bordet@gmail.com> 1455037924 +0100
committer Simone Bordet <simone.bordet@gmail.com> 1455037924 +0100

Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.