Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 12 Jun 2012 11:12:57 +0000 (13:12 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 12 Jun 2012 11:12:57 +0000 (13:12 +0200)
commit6e46a2373bcda1c1793d18936cc40fb39beb149a
tree154b641468ae669dc40f3d71da8560430291f92b
parent2ac2da4b770f57bede8e9a9ee65142242fdf05a3
parent2232e0021a1169392515f6de4fe3422c969d5fd8
Merge branch 'upstreammaster'