jetty.project/jetty-jmx/src
Michael Gorovoy 7f68abfa73 Merge branch '332200'
Conflicts:
	VERSION.txt

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3416 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-23 21:20:15 +00:00
..
main Merge branch '332200' 2011-06-23 21:20:15 +00:00
test 340920 Dynamically assign RMI registry port for integration testing 2011-03-24 23:13:35 +00:00