Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 4 Jul 2012 10:05:28 +0000 (12:05 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 4 Jul 2012 10:05:28 +0000 (12:05 +0200)
commite8b16b96a23e1ab54e780587cc7cc0345a1ddf0e
treea716a80b3badc7a716e3dcbd2eab07349d51e25b
parent6e46a2373bcda1c1793d18936cc40fb39beb149a
parent8b323c27acd2c9e0a31e9264ab85f19cbd028363
Merge branch 'upstreammaster'