Merge remote-tracking branch 'openstreetmap/pull/1350'
authorTom Hughes <tom@compton.nu>
Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)
1  2 
Gemfile.lock
test/test_helper.rb

diff --cc Gemfile.lock
Simple merge
Simple merge