Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 12 Dec 2012 09:14:22 +0000 (10:14 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 12 Dec 2012 09:14:22 +0000 (10:14 +0100)
commitf56515411fd74aaa036cd1c7138da353e7fb7712
tree4910398f7790edcd4159156287f9b545f63f235d
parent6717f88d0c48628d749af8c73939f1ddfcfba5b9
parenteb9e9478fc18f70c18a3279a4bf0d46e31785a39
Merge branch 'upstreammaster'