Merge remote-tracking branch 'origin/master' into jetty-9.1

Browse Source

Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java

...

This commit is contained in:

Greg Wilkins 2013-10-04 16:14:12 +10:00

parent 52752ae142 7cb553557e

commit a0601be95a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available