| commit | 34a0271fa3cc6cdebab7814652ef53850a6ece41 | [log] [tgz] |
|---|---|---|
| author | Greg Wilkins <gregw@intalio.com> | Mon May 27 18:30:53 2013 +1000 |
| committer | Greg Wilkins <gregw@intalio.com> | Mon May 27 18:30:53 2013 +1000 |
| tree | af1718026552d46bc8b622554b50be255e8d6ae0 | |
| parent | 6ef865b153d4ce3f3731ba349df11b9c8f811d66 [diff] | |
| parent | 48c2a410b61e08412c72e4abd5173eee0cca9bdf [diff] |
Merge remote-tracking branch 'origin/jetty-7' into jetty-8 Conflicts: jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipWithPipeliningTest.java
