Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 11 Jul 2012 12:50:24 +0000 (14:50 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 11 Jul 2012 12:50:24 +0000 (14:50 +0200)
commitd3c6968ede6e7e26e14fd54ef451cd5015a4eef2
tree063a26fa5d078286310b0f05a1cb779bc7b11f6b
parente8b16b96a23e1ab54e780587cc7cc0345a1ddf0e
parentfd3509de5c4e147252354e02fda2f2f6fae64e6d
Merge branch 'upstreammaster'