]> xenbits.xensource.com Git - people/pauldu/xenbus.git/commitdiff
Merge branch 'master' into upstream
authorPaul Durrant <paul.durrant@citrix.com>
Mon, 18 Nov 2013 11:13:17 +0000 (11:13 +0000)
committerPaul Durrant <paul.durrant@citrix.com>
Mon, 18 Nov 2013 11:13:17 +0000 (11:13 +0000)

Trivial merge