merging heads
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Wed, 28 May 2014 17:54:20 +0000 (19:54 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Wed, 28 May 2014 17:54:20 +0000 (19:54 +0200)

Trivial merge