Greg Wilkins d2794584e1 Merge remote-tracking branch 'origin/master' into servlet-3.1-api ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java jetty-server/src/main/java/org/eclipse/jetty/server/Response.java		2013-06-07 15:48:22 +10:00
..
main	Merge remote-tracking branch 'origin/master' into servlet-3.1-api	2013-06-07 15:48:22 +10:00
test	Added new examples of embedding JNDI,annotations and updated realm.properties to match distro	2013-06-07 08:49:28 +10:00