Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 08:34:44 +0000 (10:34 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 08:34:44 +0000 (10:34 +0200)
commit031e5c50de5860921dfada9a3d54a9242339836e
tree89ac2a6ad2800607b7202e274ae62b1548526aa7
parent3d9943d1e5f993408b618cde29ff31b3585e5cef
parent63afad28e5b0a1d996c7912c5362e460588c879f
Merge branch 'upstreammaster'