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/?a=commitdiff_plain;h=c19003fdc44f11c006c3d74a5e270a8ebd4c115c;hp=cff89dc18ddfba7f21d30c3f25ad29e232559a55;p=build.git

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

diff --git a/onelab-tags.mk b/onelab-tags.mk
index c34e3856..40bf4130 100644
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -55,4 +55,4 @@ sfa-BRANCH			:= geni-v3
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@geni-v3
 #
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.3-4
+tests-GITPATH                   := git://git.onelab.eu/tests.git@master