Diaspora: Auto-adding users as friend who already sharing with us
Merge branch 'master' of https://github.com/annando/friendica

Conflicts:
	include/poller.php