Merge remote branch 'jheiss/master'
authorDavid A. Cuadrado <krawek@gmail.com>
Wed, 13 Jan 2010 05:10:28 +0000 (00:10 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Wed, 13 Jan 2010 05:10:28 +0000 (00:10 -0500)
commit65220e85b805aad26c17fe75a764f12f18a3bf3e
tree05840a9da78dcd2eac69a056b20dd535ee577cb9
parent722082e1b1f1d2637a718867e24ace4b765001b2
parente53cac189c2eb22f682f01a9203239f6841f245a
Merge remote branch 'jheiss/master'

Conflicts:
config/locales/global/en.yml
config/locales/global/pt-PT.yml
app/helpers/application_helper.rb
config/locales/global/en.yml
config/locales/global/pt-PT.yml