]> xenbits.xen.org Git - xenclient/xen-pq.git/commit
Merge branch 'master' of git://git.uk.xensource.com/xenclient/xen-pq
authorJean Guyader <jean.guyader@eu.citrix.com>
Fri, 11 Dec 2009 12:09:14 +0000 (12:09 +0000)
committerJean Guyader <jean.guyader@eu.citrix.com>
Fri, 11 Dec 2009 12:09:14 +0000 (12:09 +0000)
commit87885de98a72f62a3ffeb81a8216cacf35804655
tree4d18feb1ae9d8899503e69a79cb0f89506a8b8b7
parent7b4d5d9d96c17067dd8c690cd0652d4a60d01a3c
parentec85d62e43e851f17d7fb5470fb26d2b3887f70b
Merge branch 'master' of git://git.uk.xensource.com/xenclient/xen-pq

Conflicts:

master/series
master/series