Merging nepi-3.1-icn into nepi-3-dev
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 21 Aug 2014 22:12:05 +0000 (00:12 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 21 Aug 2014 22:12:05 +0000 (00:12 +0200)

Trivial merge