]> xenbits.xensource.com Git - people/iwj/xen.git/commitdiff
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Wed, 17 Apr 2013 11:52:11 +0000 (12:52 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 17 Apr 2013 11:52:11 +0000 (12:52 +0100)

Trivial merge