Tom Hughes 78f608b114 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		2012-12-01 18:22:30 +00:00
..
images	Merge branch 'master' into notes	2012-12-01 18:22:30 +00:00
javascripts	Merge branch 'master' into notes	2012-12-01 18:22:30 +00:00
opensearch	Serve OpenSearch definition though the assets pipeline	2011-12-30 22:37:11 +00:00
stylesheets	Merge branch 'master' into notes	2012-12-01 18:22:30 +00:00