Merge remote-tracking branch 'osmlab/id-default'
authorTom Hughes <tom@compton.nu>
Fri, 23 Aug 2013 16:41:09 +0000 (17:41 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 23 Aug 2013 16:41:09 +0000 (17:41 +0100)
1  2 
app/controllers/site_controller.rb

Simple merge