Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 25 Nov 2011 07:29:49 +0000 (08:29 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 25 Nov 2011 07:29:49 +0000 (08:29 +0100)
commit904c314440f4f0bd3f5c6c767fd7293f4887815b
tree4fcac04569ed698e5815d1b9c236aac2fa51fb52
parent98a3d5acb879be2ef37b3d5b9689f18bdb824702
parent58e6df0ffc61516da76846bd94188d77635a6371
Merge branch 'upstreammaster'