Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 1 Dec 2011 09:34:42 +0000 (10:34 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 1 Dec 2011 09:34:42 +0000 (10:34 +0100)
commit72c373c3b1ecd0d14fb945913856443baaca3f8f
tree52f73e20bcc8588edc3c9a16052352c5731b1735
parent90ab94deecf2371c199d56cd35f0fd4fd20233e4
parent7f61a7924523a8bedfa7d09068191b075d0f962a
Merge branch 'upstreammaster'