From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 21 Feb 2013 13:51:21 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.2.1~38
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=3468bc91d0e90308119bee9b8d72e4ed338bbb19

Merge branch 'master' of ssh://git.onelab.eu/git/build

Conflicts:
	onelab-tags.mk
---

3468bc91d0e90308119bee9b8d72e4ed338bbb19