Merge branch 'master' of
ssh://git@github.com/glycoknob/query.api.freifunk.net.git

Conflicts:
	ffapi-import/pom.xml
Merge remote-tracking branch 'origin/master'