Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 30 Aug 2012 10:13:20 +0000 (12:13 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 30 Aug 2012 10:13:20 +0000 (12:13 +0200)
commit3d9943d1e5f993408b618cde29ff31b3585e5cef
tree52336f9e7574e845d99abced2b022a58a2f8b54a
parentd8d584c3122c72a43422493b7c573e2d4b9d3e5e
parentbd6285e1772946be61209b499fdc5ff48fb104bf
Merge branch 'upstreammaster'