Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 13 Jul 2012 07:27:37 +0000 (09:27 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 13 Jul 2012 07:27:37 +0000 (09:27 +0200)
commitd8d584c3122c72a43422493b7c573e2d4b9d3e5e
treefa21c808eab69627df71a995c52e27cf00d62a24
parent999893377056972a8ac599135dee3f6cbe530f3f
parentacda727faf87af72209a6abb58f6af35b6c3a297
Merge branch 'upstreammaster'