Joakim Erdfelt 8636c7da45 Merge branch 'master' into jetty-9.1 ... Conflicts: jetty-maven-plugin/pom.xml pom.xml		2013-08-05 09:53:48 -07:00
..
src	Merge branch 'master' into jetty-9.1	2013-08-05 09:53:48 -07:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-07-26 11:50:17 -05:00