Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 17 Nov 2011 10:32:17 +0000 (11:32 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 17 Nov 2011 10:32:17 +0000 (11:32 +0100)
commitbc606b4e5ce0cf686274510d1167ec85340c4e83
treed57c7fd4b8d577836f0199e54409b14c124915e6
parent69fb221c274eb0b6e9f6ff6f895e5e6f90b17230
parent52c5ae55d0ecbc2b10f4e6981f7e10b590f73cd9
Merge branch 'upstreammaster'