Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc ... Conflicts: api/src/com/cloud/api/ApiConstants.java		2012-08-02 18:45:37 -07:00
..
com/cloud	Merge branch 'master' into vpc	2012-08-02 18:45:37 -07:00
resources	Switch to Apache license	2012-04-03 04:50:05 -07:00
async-job-component.xml	fixing line endings in server	2012-04-07 20:13:10 -04:00
sync-queue-component.xml	fixing line endings in server	2012-04-07 20:13:10 -04:00