Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Nov 2011 17:54:00 +0000 (18:54 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Nov 2011 17:54:00 +0000 (18:54 +0100)
commita665d295716a0f85228d4990ac05397d1b4ffffe
tree4e6cac03587d9c6424e4ad270ed294cd1cf91e84
parentc0627fead40cd7ae78f22c8878dd8a017d07879c
parent6a5b0c92373c2cd388e0d76f25319c8822a79a01
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
config/default_config.xml