tree b14517a942d1938351b9aae9e2a7adf56cf05a42
parent 4a7fae30fbecfedf49200f2c2b6c644aea2df7b0
parent e853632c2210eaf5225dd48618b482004dab38ef
author Simone Bordet <simone.bordet@gmail.com> 1454943413 +0100
committer Simone Bordet <simone.bordet@gmail.com> 1454943413 +0100

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