From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 1 Jul 2010 12:22:28 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/omf
X-Git-Tag: omf-5.3-6~5
X-Git-Url: http://git.onelab.eu/?p=omf.git;a=commitdiff_plain;h=7b60d185ba89433f7dea2f3469098b5b692911f1

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

7b60d185ba89433f7dea2f3469098b5b692911f1