∑
merge
Merge branch 'master' of https://github.com/usabi/gfp
cambios en locales