Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Wed, 2 Nov 2016 18:22:50 +0000 (19:22 +0100)

committer Sarah Hoffmann <lonvia@denofr.de>

Wed, 2 Nov 2016 18:22:50 +0000 (19:22 +0100)
author Sarah Hoffmann <lonvia@denofr.de>
Wed, 2 Nov 2016 18:22:50 +0000 (19:22 +0100)
committer Sarah Hoffmann <lonvia@denofr.de>
Wed, 2 Nov 2016 18:22:50 +0000 (19:22 +0100)
diff --cc lib/Geocode.php
Simple merge
diff --cc lib/PlaceLookup.php
Simple merge
diff --cc lib/lib.php
Simple merge
diff --cc utils/update.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Wed, 2 Nov 2016 18:22:50 +0000 (19:22 +0100)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Wed, 2 Nov 2016 18:22:50 +0000 (19:22 +0100)
		1	2
lib/Geocode.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/PlaceLookup.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
utils/update.php	patch \|	diff1 \|	diff2 \|	blob \| history