Merging nepi-3.1-multirun into nepi-3-dev
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Sun, 3 Aug 2014 18:13:16 +0000 (20:13 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Sun, 3 Aug 2014 18:13:16 +0000 (20:13 +0200)

Trivial merge