Merge remote-tracking branch 'upstream/master'
-rw-r--r-- 122 .gitignore
-rw-r--r-- 115 .gitmodules
-rw-r--r-- 1312 .travis.yml
-rw-r--r-- 248 AUTHORS
-rw-r--r-- 5453 CMakeLists.txt
-rw-r--r-- 3857 CONTRIBUTING.md
-rw-r--r-- 18092 COPYING
-rw-r--r-- 7499 ChangeLog
-rw-r--r-- 1763 README.md
-rw-r--r-- 5963 VAGRANT.md
-rw-r--r-- 1947 Vagrantfile
drwxr-xr-x - cmake
drwxr-xr-x - data-sources
drwxr-xr-x - data
drwxr-xr-x - docs
drwxr-xr-x - lib
drwxr-xr-x - module
drwxr-xr-x - munin
drwxr-xr-x - mysql2pgsql
drwxr-xr-x - nominatim
m--------- - osm2pgsql
-rw-r--r-- 5356 phpcs.xml
drwxr-xr-x - settings
drwxr-xr-x - sql
drwxr-xr-x - test
drwxr-xr-x - utils
drwxr-xr-x - vagrant
drwxr-xr-x - website
drwxr-xr-x - wikidata