Brian Federle 25f2f0fcb7 Merge branch 'master' into ui-vm-affinity ... Conflicts: ui/scripts/instances.js		2013-04-24 16:02:56 -07:00
..
resources	Merge branch 'master' into ui-vm-affinity	2013-04-24 16:02:56 -07:00