Merge remote-tracking branch 'lonvia/inverse-query-II'

author Sarah Hoffmann <lonvia@denofr.de>

Wed, 21 Jan 2015 21:45:48 +0000 (22:45 +0100)

committer Sarah Hoffmann <lonvia@denofr.de>

Wed, 21 Jan 2015 21:45:48 +0000 (22:45 +0100)
author Sarah Hoffmann <lonvia@denofr.de>
Wed, 21 Jan 2015 21:45:48 +0000 (22:45 +0100)
committer Sarah Hoffmann <lonvia@denofr.de>
Wed, 21 Jan 2015 21:45:48 +0000 (22:45 +0100)
diff --cc lib/Geocode.php
Simple merge
diff --cc lib/lib.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Wed, 21 Jan 2015 21:45:48 +0000 (22:45 +0100)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Wed, 21 Jan 2015 21:45:48 +0000 (22:45 +0100)
		1	2
lib/Geocode.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history