Merge remote branch 'origin/badges'
authorDavid A. Cuadrado <krawek@gmail.com>
Wed, 6 Jan 2010 06:33:49 +0000 (01:33 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Wed, 6 Jan 2010 06:33:49 +0000 (01:33 -0500)
commitacf19607f63905f32ce97435a72e976614044654
tree4a8ed907027d574c4e4969e630a2d5bf1ab66c4e
parent74cf72b9dda5d3ddcbc704131ac99d4a6dd79ad5
parent8d7bf2317a148f38b23f14605929dee3afa436a1
Merge remote branch 'origin/badges'
app/stylesheets/navigation/_navigation.sass
config/locales/layouts/en.yml
config/locales/layouts/es-AR.yml
config/locales/layouts/fr.yml
config/locales/layouts/pt-PT.yml
config/routes.rb