Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Tue, 15 Jan 2013 21:11:35 +0000 (21:11 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 15 Jan 2013 21:11:35 +0000 (21:11 +0000)
commit3d7eb387a7c3573f1a1d17df00adcaa1fb9b9fa5
treed67919084b1ae2374696f18828fb9a778a2d03f7
parentee530d8111c92999e1a495b5a23aea9319c1309c
parentf111e6c1cf2f677a10ffa22a167613e3ac575c5b
Merge branch 'master' into notes

Conflicts:
Gemfile.lock
app/assets/stylesheets/common.css.scss
app/views/browse/_map.html.erb
app/views/user/view.html.erb
config/locales/en.yml
Gemfile
Gemfile.lock
app/assets/javascripts/index.js
app/assets/stylesheets/common.css.scss
app/helpers/application_helper.rb
app/views/browse/_map.html.erb
app/views/user/view.html.erb
config/locales/de.yml
config/locales/en.yml
test/functional/browse_controller_test.rb