]> xenbits.xensource.com Git - xenrt-citrix/xenrt.git/commitdiff
Merge branch 'resources' into 'master'
authorJohn Dilley <john.dilley@citrix.com>
Thu, 5 Nov 2015 10:19:33 +0000 (02:19 -0800)
committerJohn Dilley <john.dilley@citrix.com>
Thu, 5 Nov 2015 10:19:33 +0000 (02:19 -0800)
CA-187851

See merge request !114


Trivial merge