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)

Trivial merge