Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Sat, 1 Dec 2012 18:22:30 +0000 (18:22 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 1 Dec 2012 18:22:30 +0000 (18:22 +0000)
commit78f608b114c05f1147936a57b930831e28000c1a
tree8dd77ba20db18cfd46aa96b11ca3201b8012532c
parent5fe5777a58751e3626f645d57dafb0dd854586ec
parent9dfb2729abf4836992e51c726326e26e7791d243
Merge branch 'master' into notes

Conflicts:
app/assets/javascripts/browse.js
app/assets/javascripts/map.js.erb
app/assets/stylesheets/common.css.scss
app/views/site/index.html.erb
12 files changed:
Gemfile
Gemfile.lock
app/assets/javascripts/browse.js
app/assets/javascripts/index.js
app/assets/javascripts/map.js.erb
app/assets/javascripts/osm.js.erb
app/assets/stylesheets/common.css.scss
app/views/site/index.html.erb
app/views/user/view.html.erb
config/locales/de.yml
config/locales/en.yml
config/routes.rb