Brian Federle 698a1bb3cd Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss
Conflicts:
	client/WEB-INF/classes/resources/messages.properties
2012-03-28 15:03:17 -07:00
..