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
..
apidoc	Merge branch 'master' into vpc	2012-06-28 17:44:08 -07:00
bindir	applying the commits from Chip Childers licensing cleanup	2012-06-26 10:44:04 -04:00
db	Merge branch 'master' into vpc	2012-07-27 13:47:46 -07:00
.project	Branch 2.1.refactor committed	2010-08-11 09:13:42 -07:00