Merge branch 'master' into kvm
authorRomain Courteaud <romain@nexedi.com>
Mon, 2 Jan 2012 12:18:24 +0000 (13:18 +0100)
committerRomain Courteaud <romain@nexedi.com>
Mon, 2 Jan 2012 12:18:24 +0000 (13:18 +0100)
commitd284d1f9a90d4fbd179c8031afdfc3aa41a78d00
tree5693334784ddb74c45549f240a60c750926e818d
parentec2d176121ddec8dfa685046ee16bdff0940298e
parent58296c3599091d9e28bfde31918fe47d81eed493
Merge branch 'master' into kvm
setup.py