]> xenbits.xensource.com Git - people/pauldu/xen.git/commitdiff
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Tue, 31 Mar 2015 16:29:48 +0000 (17:29 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 31 Mar 2015 16:29:48 +0000 (17:29 +0100)

Trivial merge