Merge branch 'master' into redesign
authorJohn Firebaugh <john.firebaugh@gmail.com>
Sat, 16 Nov 2013 00:47:49 +0000 (16:47 -0800)
committerJohn Firebaugh <john.firebaugh@gmail.com>
Sat, 16 Nov 2013 00:47:49 +0000 (16:47 -0800)
commit2b4f8e92c969a5508b73ae7af45811a118fda6b1
tree7e6193fa9dfac0ece77992a89b64bcc29269dbd6
parent5ddab68c11ad7ac85bf3b80e250aa4454292a53c
parentad368d189f4842f18e81fd272c677e5d820a2da4
Merge branch 'master' into redesign

Conflicts:
app/controllers/browse_controller.rb
app/views/layouts/_head.html.erb
config/environments/production.rb
config/routes.rb
app/controllers/geocoder_controller.rb
app/controllers/site_controller.rb
app/views/layouts/_head.html.erb
config/environments/production.rb
config/locales/en.yml
config/routes.rb