Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 15 Dec 2011 13:18:39 +0000 (14:18 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 15 Dec 2011 13:18:39 +0000 (14:18 +0100)
commit7d41479ffc629cabcab476a94e4e93be41b29ecf
tree7de00eba144b2269cb05f832133eabbbb42043f9
parentfe26b3a1489881ee252977df84561ea51da93ec2
parent0a9aae617f7d6ceb4e169fedc6883928dce0b7b6
Merge branch 'upstreammaster'