Marien Fressinaud 54479a5027 Merge branch 'dev' into beta 11 years ago
..
en.php 54479a5027 Merge branch 'dev' into beta 11 years ago
fr.php 54479a5027 Merge branch 'dev' into beta 11 years ago