Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 10:23:17 +0000 (12:23 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 10:23:17 +0000 (12:23 +0200)
commit84d7c64d69aca48fe56233346a38ad0d6ef778a8
tree2809d9087fc55d0b404745383ce4c46d1ac0e4e3
parent031e5c50de5860921dfada9a3d54a9242339836e
parent0f2ac2c08a04ba8bc093675e16876b751fa624f9
Merge branch 'upstreammaster'