Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Mon, 27 Feb 2017 21:30:54 +0000 (22:30 +0100)

committer Sarah Hoffmann <lonvia@denofr.de>

Mon, 27 Feb 2017 21:30:54 +0000 (22:30 +0100)
author Sarah Hoffmann <lonvia@denofr.de>
Mon, 27 Feb 2017 21:30:54 +0000 (22:30 +0100)
committer Sarah Hoffmann <lonvia@denofr.de>
Mon, 27 Feb 2017 21:30:54 +0000 (22:30 +0100)
diff --cc CMakeLists.txt
Simple merge
diff --cc lib/Geocode.php
Simple merge
diff --cc sql/functions.sql
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Mon, 27 Feb 2017 21:30:54 +0000 (22:30 +0100)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Mon, 27 Feb 2017 21:30:54 +0000 (22:30 +0100)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Geocode.php	patch \|	diff1 \|	diff2 \|	blob \| history
sql/functions.sql	patch \|	diff1 \|	diff2 \|	blob \| history