Merge remote-tracking branch 'ivan/bug/fix_default_language_localization' into develop
authorTomás Touceda <chiiph@leap.se>
Thu, 27 Jun 2013 19:59:12 +0000 (16:59 -0300)
committerTomás Touceda <chiiph@leap.se>
Thu, 27 Jun 2013 19:59:12 +0000 (16:59 -0300)

Trivial merge