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)
commitae0177fbe61d7d02e3c6b441bd395fff6fd96a18
tree771ef3ab0dd09dce8bc14404594c526574b4f360
parentfa339033e1f00f4f3e2b9c790c5100a863cf91ac
parent8dc16bd8dbd362a0e823f8abd989d871ce5de32f
Merge remote-tracking branch 'osmlab/id-default'
app/controllers/site_controller.rb