Merge remote-tracking branch 'upstream/master'
Reverse an earlier over-zealous check for a non-null value of the retriever.  This prevented lots and lots of feed items coming through.

Conflicts:
	retriever/retriever.php
Clarify the language of the help text a little
Merge remote-tracking branch 'upstream/master' into retriever

Conflicts:
	retriever/view/help.tpl
Merge pull request #119 from mexon/retriever

Reverse an earlier over-zealous check for a non-null value of the retrie...
Merge remote branch 'upstream/master'
Merge remote branch 'origin/master'
updates
Merge https://github.com/friendica/friendica-addons into apull
pumpio: New plugin to post to pump.io servers
pumpio: Preparing mirroring
pumpio: Mirror activated - not running by now
Merge remote branch 'upstream/master'
dummy README
template for admin config dialog
addon code
READNE text by Stephen
README text by Stephen
tar ball of the WebRTC addon
add reminder if configuration was not done by the admin