Merge remote branch 'origin/fix-i18n-detection' v3.2
authorDavid A. Cuadrado <krawek@gmail.com>
Sat, 3 Apr 2010 23:33:19 +0000 (18:33 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sat, 3 Apr 2010 23:33:19 +0000 (18:33 -0500)
commit5ccd2d413441cfc91a15ed6f72d8219b50596ea7
tree8d917faad0636c4a72d21be8a4a089f41dab2125
parent5b53a54c903aa533383f2a6f523b3b0c5b755ad7
parentc22fde64f3f655099f00c1ccfd8f8ab37a58858c
Merge remote branch 'origin/fix-i18n-detection'

Conflicts:
app/controllers/users_controller.rb
app/controllers/users_controller.rb
app/helpers/application_helper.rb