Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 24 Jan 2013 16:46:29 +0000 (17:46 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 24 Jan 2013 16:46:29 +0000 (17:46 +0100)
commita49c0e1ae9001aa0ff22cc7262e5669db0739df5
tree5a2830a9cb88516af21ab686fb8f57147a25daad
parent667ee8a8989f8bba94827c4e9d3ea86b168a7e92
parent0b3477f4871a6b47b8a3b99666ffdf5fa53dfa97
Merge branch 'upstreammaster'