merging the nepi-3.0-pre-release branch with nepi-3-dev
authorJulien Tribino <julien.tribino@inria.fr>
Fri, 6 Dec 2013 18:36:44 +0000 (19:36 +0100)
committerJulien Tribino <julien.tribino@inria.fr>
Fri, 6 Dec 2013 18:36:44 +0000 (19:36 +0100)

Trivial merge