Some small bugfixes (mostly warnings) and little improvements to the log
Avoiding a warning in the error.log
New network constant for the Diaspora posting connector.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/acl_selectors.php
API: Some more stuff to make the API more complete (compared to the original Twitter API)
API: New function "conversation/show" - this is an unoffical Twitter command
Merge pull request #896 from annando/master

API and Diaspora posting connector