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
..
cloudstack3-ie7.css	CS-14053: IE compatibility issues	2012-05-25 00:42:23 +05:30
cloudstack3.css	Merge branch 'master' into vpc	2012-07-27 13:47:46 -07:00
cloudstack3.ja.css	Localizaton fixes	2012-02-22 17:32:00 -08:00