xenadmin/XenAdmin/Actions
Gabor Apati-Nagy 53619c775d Merge remote-tracking branch 'github_xenadmin/master' into REQ-156_github_master
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

Conflicts:
	XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs
	XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs
	XenModel/Actions/ParallelAction.cs
	XenModel/FriendlyNames.resx
	XenModel/Messages.Designer.cs
	XenModel/Messages.resx
2016-08-18 12:22:40 +01:00
..
GUIActions Merge remote-tracking branch 'github_xenadmin/master' into REQ-156_github_master 2016-08-18 12:22:40 +01:00
OVFActions CA-192541: Added detail to the Import/Export OVF/OVA and Import Disk Image actions 2016-07-19 23:53:17 +01:00