Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 May 2012 08:22:54 +0000 (10:22 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 May 2012 08:22:54 +0000 (10:22 +0200)
commit2ac2da4b770f57bede8e9a9ee65142242fdf05a3
treebf1ee6cf15740edbfdd9034efbb78098b19ac99c
parent951442dd2320e49e39807476ffc248377886c00f
parent5217d46556d445cf0b91d95811d112d758ba8be1
Merge branch 'upstreammaster'