Brian Federle 25f2f0fcb7 Merge branch 'master' into ui-vm-affinity ... Conflicts: ui/scripts/instances.js		2013-04-24 16:02:56 -07:00
..
classes/resources	Merge branch 'master' into ui-vm-affinity	2013-04-24 16:02:56 -07:00
web.xml	Don't load from a fixed path, but load from the classpath so admins or packagers can overwrite the logging config	2013-02-28 21:28:46 +01:00