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
..