Ragnar B. Johannsson 83b3580c32 Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss
Conflicts:
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/vm/UserVmVO.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2011-01-12 17:06:08 +00:00
..
2010-09-09 13:27:20 -07:00
2010-08-11 09:13:29 -07:00
2010-12-28 09:40:06 -08:00
2010-08-12 17:19:30 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2010-09-09 13:27:20 -07:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2010-12-22 11:04:28 -08:00