Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 1 Dec 2011 10:59:52 +0000 (11:59 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 1 Dec 2011 10:59:52 +0000 (11:59 +0100)
commitfe26b3a1489881ee252977df84561ea51da93ec2
tree6121070a26976285d20b7bc307b02671132d8dd2
parent72c373c3b1ecd0d14fb945913856443baaca3f8f
parent2ca98e9fe9c333b99fa7ba9f8950673d55db8a99
Merge branch 'upstreammaster'