Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 18 Oct 2012 11:53:16 +0000 (13:53 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 18 Oct 2012 11:53:16 +0000 (13:53 +0200)
commit6b2452ee7afc1b8b5723497aa04d3b985cbb726f
tree2a0d659a9c535a207e140d90666fee6d2ac4ffe7
parent7fcb8153bd74ce00f9f0d43c8aa090e0b70e345f
parentb6c27bf1bbd40f94b2129237f2f1acc47937c8b8
Merge branch 'upstreammaster'