Merge branch 'master' of ssh://git.onelab.eu/git/sfa
Thierry Parmentelat [Wed, 23 Nov 2011 17:54:00 +0000 (18:54 +0100)]
1  2 
config/default_config.xml

Simple merge