Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 30 Nov 2011 20:34:02 +0000 (21:34 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 30 Nov 2011 20:34:02 +0000 (21:34 +0100)
commit90ab94deecf2371c199d56cd35f0fd4fd20233e4
tree5403516ad725a54db5c51e122350677258b540af
parent904c314440f4f0bd3f5c6c767fd7293f4887815b
parent5aedc35a6550cd1bb31b99535746251bc05b9115
Merge branch 'upstreammaster'