Greg Wilkins b59949253d Merge remote-tracking branch 'origin/master' into servlet-3.1-api ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java		2013-05-30 17:17:54 +10:00
..
jetty-osgi-boot	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-05-30 17:17:54 +10:00
jetty-osgi-boot-jsp	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-05-28 22:51:31 +10:00
jetty-osgi-boot-warurl	[maven-release-plugin] prepare for next development iteration	2013-05-06 18:13:04 -05:00
jetty-osgi-httpservice	[maven-release-plugin] prepare for next development iteration	2013-05-06 18:13:04 -05:00
jetty-osgi-npn	[maven-release-plugin] prepare for next development iteration	2013-05-06 18:13:04 -05:00
test-jetty-osgi	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-05-30 17:17:54 +10:00
test-jetty-osgi-context	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-05-17 14:09:17 +10:00
test-jetty-osgi-webapp	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-05-28 22:51:31 +10:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-05-06 18:13:04 -05:00