Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/rules/RulesManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineGuru.java		2012-07-27 13:47:46 -07:00
..
src/com/cloud	Merge branch 'master' into vpc	2012-07-27 13:47:46 -07:00
test/com/cloud	License header updates for the core folder from Chip Childers	2012-07-02 09:54:47 -04:00
.classpath	fixed eclipse classpath	2011-08-31 13:35:37 -07:00
.project	revert un neccessary changes	2010-09-29 18:40:52 -07:00