Brian Federle 25f2f0fcb7 Merge branch 'master' into ui-vm-affinity ... Conflicts: ui/scripts/instances.js		2013-04-24 16:02:56 -07:00
..
cloudstack3-ie7.css	IE7: Fix quick view icons disappearing	2012-10-16 14:06:54 -07:00
cloudstack3.css	Merge branch 'master' into ui-vm-affinity	2013-04-24 16:02:56 -07:00
cloudstack3.ja.css	License header updates for the UI folder	2012-08-03 12:45:47 -04:00