From: John Dilley <john.dilley@citrix.com>
Date: Thu, 5 Nov 2015 10:19:33 +0000 (-0800)
Subject: Merge branch 'resources' into 'master'
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=13879f7ef8280e05d66d4e0fabd564f09d217dbe;p=xenrt-citrix%2Fxenrt.git

Merge branch 'resources' into 'master'

CA-187851



See merge request !114
---

13879f7ef8280e05d66d4e0fabd564f09d217dbe