05
Merge branch 'master' of github.com:vindurriel/joel_on_software_translation