From: Julien Tribino <julien.tribino@inria.fr>
Date: Fri, 6 Dec 2013 18:36:44 +0000 (+0100)
Subject: merging the nepi-3.0-pre-release branch with nepi-3-dev
X-Git-Tag: nepi-3.1.0~154
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d662dcbab5a504791e306489dde627dde9221fd1;p=nepi.git

merging the nepi-3.0-pre-release branch with nepi-3-dev
---

d662dcbab5a504791e306489dde627dde9221fd1