Brian Federle eacbb4cb2d Merge branch 'master' into ui-add-remove-nics ... Conflicts: client/WEB-INF/classes/resources/messages.properties ui/dictionary.jsp		2013-04-30 11:57:38 -07:00
..
classes/resources	Merge branch 'master' into ui-add-remove-nics	2013-04-30 11:57:38 -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