Merge remote-tracking branch 'osmlab/hash'
authorTom Hughes <tom@compton.nu>
Sun, 4 Aug 2013 11:38:59 +0000 (12:38 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 4 Aug 2013 11:38:59 +0000 (12:38 +0100)

Trivial merge