Merge branch 'master' of github.com:SiriDB/siridb-server into dev

author Jeroen van der Heijden <jeroen@transceptor.technology>

Wed, 2 Jan 2019 12:30:59 +0000 (13:30 +0100)

committer Jeroen van der Heijden <jeroen@transceptor.technology>

Wed, 2 Jan 2019 12:30:59 +0000 (13:30 +0100)
author Jeroen van der Heijden <jeroen@transceptor.technology>
Wed, 2 Jan 2019 12:30:59 +0000 (13:30 +0100)
committer Jeroen van der Heijden <jeroen@transceptor.technology>
Wed, 2 Jan 2019 12:30:59 +0000 (13:30 +0100)
diff --cc itest/run_all.py
Simple merge
diff --cc itest/test_select.py
Simple merge
diff --cc src/siri/db/points.c
Simple merge
author	Jeroen van der Heijden <jeroen@transceptor.technology>
	Wed, 2 Jan 2019 12:30:59 +0000 (13:30 +0100)
committer	Jeroen van der Heijden <jeroen@transceptor.technology>
	Wed, 2 Jan 2019 12:30:59 +0000 (13:30 +0100)
		1	2
itest/run_all.py	patch \|	diff1 \|	diff2 \|	blob \| history
itest/test_select.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/siri/db/points.c	patch \|	diff1 \|	diff2 \|	blob \| history