Min Chen 613a061977 Merge branch 'master' into vim51_win8 ... Conflicts: plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java		2013-03-04 17:32:52 -08:00
..
com/cloud	Merge branch 'master' into vim51_win8	2013-03-04 17:32:52 -08:00
org/apache/cloudstack/region	CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes and RegionsAPIUtil.	2013-02-26 14:21:21 +05:30