Merge remote-tracking branch 'openstreetmap/pull/1120'
[rails.git] / script / vagrant /
drwxr-xr-x   ..
drwxr-xr-x - setup