Merge commit 'discon/master' into ja-i18n
authorPatrick Aljord <patcito@gmail.com>
Sun, 6 Jun 2010 21:12:02 +0000 (16:12 -0500)
committerPatrick Aljord <patcito@gmail.com>
Sun, 6 Jun 2010 21:13:42 +0000 (16:13 -0500)
commit26362b61d1f7a919582bd2eff56514fb78459633
tree2d543246687440d794a75ccfe106eb99d91ee6a2
parent222506c1da9619d80242b2d7972ac5722489595e
parent5ccaea7c83dd2b8ae52b3d31c7a20b4d2d5e7814
Merge commit 'discon/master' into ja-i18n

Conflicts:
app/controllers/application_controller.rb
config/initializers/01_locales.rb
app/controllers/application_controller.rb
app/models/custom_html.rb
config/initializers/01_locales.rb
config/locales/groups/el.yml
config/locales/users/el.yml