Merge branch 'nm-one-spec'
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 15 May 2014 10:55:37 +0000 (12:55 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 15 May 2014 10:55:37 +0000 (12:55 +0200)
commitc19003fdc44f11c006c3d74a5e270a8ebd4c115c
tree01c3aff11aa4ff69d9d84347c929057cddbacd19
parente38d7d391d67e5311b019fb8c5f45bee9a344348
parentcff89dc18ddfba7f21d30c3f25ad29e232559a55
Merge branch 'nm-one-spec'