From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Mon, 28 Jul 2014 09:10:48 +0000 (+0200)
Subject: Merging opt-3.1 into nepi-3-dev
X-Git-Tag: nepi-3.2.0~118
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=0b2ce43bb7573f766bb348117d089e81d2a395ff

Merging opt-3.1 into nepi-3-dev
---

0b2ce43bb7573f766bb348117d089e81d2a395ff