Merge remote-tracking branch 'origin/master' into new-ui
authorJorge Cuadrado <kuadrosxx@gmail.com>
Fri, 3 Feb 2012 22:20:45 +0000 (17:20 -0500)
committerJorge Cuadrado <kuadrosxx@gmail.com>
Fri, 3 Feb 2012 22:20:45 +0000 (17:20 -0500)
commitae9687a343ed73850f9b44405b50a5499862402d
tree0d587cab0828aee8acd80e0d1dd00dd1ccf9fd20
parent1fdd16b7ed8bc1a66d5f088eb2d6771e1db72f0f
parent1116bb6f8c4b443827906be933f88013ea08c207
Merge remote-tracking branch 'origin/master' into new-ui
app/assets/javascripts/i18n/fi.js
app/assets/javascripts/i18n/nb.js
app/helpers/application_helper.rb
app/models/group.rb