Tom Hughes 0037502426 Merge branch 'master' into notes ... Conflicts: Gemfile.lock app/views/browse/_map.html.erb app/views/site/index.html.erb		2012-10-13 15:55:34 +01:00
..
assets	Merge branch 'master' into notes	2012-10-13 15:55:34 +01:00
controllers	Merge branch 'master' into notes	2012-10-13 15:55:34 +01:00
helpers	Merge branch 'master' into notes	2012-10-13 15:55:34 +01:00
models	Merge branch 'master' into notes	2012-10-13 15:55:34 +01:00
views	Merge branch 'master' into notes	2012-10-13 15:55:34 +01:00