From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Fri, 26 Jul 2013 17:02:37 +0000 (-0700)
Subject: Merging heads
X-Git-Tag: nepi-3.0.0~55
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e1775e60fe18089a707aa3ddd3607e53f880853c;p=nepi.git

Merging heads
---

e1775e60fe18089a707aa3ddd3607e53f880853c