Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 11 Jul 2012 15:45:04 +0000 (17:45 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 11 Jul 2012 15:45:04 +0000 (17:45 +0200)
commit999893377056972a8ac599135dee3f6cbe530f3f
treeeeb0033bc462f49e073ca906d43c0989626d851e
parentd3c6968ede6e7e26e14fd54ef451cd5015a4eef2
parent384192982d4c4f40a94b0073046b935643905671
Merge branch 'upstreammaster'