From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 15 May 2014 10:55:37 +0000 (+0200)
Subject: Merge branch 'nm-one-spec'
X-Git-Tag: 5.3.6~35
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=c19003fdc44f11c006c3d74a5e270a8ebd4c115c

Merge branch 'nm-one-spec'
---

c19003fdc44f11c006c3d74a5e270a8ebd4c115c