Revision be449d79c84781740dd03b83b64e572b81cbbdbd

Committed on 02/07/2013 7:25 am by Madeline VEYRENC <madeline.veyrenc@openwide.fr> [GitHub Diff]

Merge branch 'master' of github.com:Open-Wide/OWEditorial

Conflicts:
translations/fre-FR/translation.ts