Merging heads
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Tue, 5 Nov 2013 10:53:40 +0000 (11:53 +0100)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Tue, 5 Nov 2013 10:53:40 +0000 (11:53 +0100)

Trivial merge