• Mateusz Łoskot's avatar
    Merge branch 'master' into develop-3.2.3 · e4376eda
    Mateusz Łoskot authored
    wip: Merging SOCI 3.2.3 changes (current master) into develop.
    
    Conflicts:
    	.gitignore
    	.travis.yml
    	AUTHORS
    	CHANGES
    	cmake/SociBackend.cmake
    	cmake/modules/FindODBC.cmake
    	docs/installation.html
    	include/soci/boost-fusion.h
    	include/soci/boost-tuple.h
    	include/soci/odbc/soci-odbc.h
    	include/soci/prepare-temp-type.h
    	include/soci/ref-counted-prepare-info.h
    	include/soci/soci-platform.h
    	include/soci/statement.h
    	include/soci/use.h
    	include/soci/version.h
    	src/CMakeLists.txt
    	src/backends/postgresql/test/test-postgresql.cpp
    	src/backends/sqlite3/blob.cpp
    	src/backends/sqlite3/test/test-sqlite3.cpp
    	src/core/CMakeLists.txt
    	src/core/test/common-tests.h
    	tests/mysql/test-mysql.cpp
    	www/index.html
    e4376eda