Brian Federle 7b011e7ef4 Merge branch 'master' into ui-vm-affinity
Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/scripts/cloudStack.js
	ui/scripts/instanceWizard.js
2013-04-22 13:45:29 -07:00
..
2013-03-14 15:54:37 -07:00
2013-04-16 11:44:00 -07:00
2012-10-10 11:18:02 -07:00