Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 24 Apr 2012 16:51:51 +0000 (18:51 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 24 Apr 2012 16:51:51 +0000 (18:51 +0200)
commit951442dd2320e49e39807476ffc248377886c00f
tree8abc623344f79572d865a7c7744a8cb99e5781df
parentc900832bcc4f4dddceeac1978d56e5f10e0e2bb5
parent2a0adf2e0b1e12a5bef0480bb9b0526e44f23ef2
Merge branch 'upstreammaster'