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
..
classes/resources	Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss	2012-03-28 15:03:17 -07:00
web.xml	Added default endpointe URL and renamed cloudkit to mycloud in the complete registration servlet.	2011-04-28 16:05:38 -07:00