| commit | e95301b906d70097b29f5f5aec28227f52a35ae7 | [log] [tgz] |
|---|---|---|
| author | Jan Bartel <janb@intalio.com> | Fri Feb 22 18:37:29 2013 +1100 |
| committer | Jan Bartel <janb@intalio.com> | Fri Feb 22 18:37:29 2013 +1100 |
| tree | 3227bdf4f24baf512246c2e2533a3b557f8a2b6b | |
| parent | 9234f3ec9051d74a10149732ed85729b89b0a103 [diff] | |
| parent | 4cb0a964efadd9b3b89bed33079ae42e39dd9856 [diff] |
Merge remote-tracking branch 'origin/jetty-8' Conflicts: jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/SafariD00.java
