Merge remote-tracking branch 'upstream/master'

doc/to_do_code.bb

@@ -4,6 +4,7 @@ We need much more than this, but here are areas where developers can help. Pleas
 
 [li]Documentation - see Red Documentation Project To-Do List[/li]
 [li]Include TOS link in registration/verification email[/li]
+[li]Create bug tracker module[/li]
 [li]Finish the anti-spam bayesian engine[/li]
 [li]implement an email permission denied bounce message from the sys channel[/li]
 [li]finish Wordpress connector - import wordpress comments back to redmatrix[/li]

include/diaspora.php

@@ -1395,7 +1395,12 @@ function diaspora_comment($importer,$xml,$msg) {
 
 	$datarray['body'] = $body;
 
-	$datarray['app']  = 'Diaspora';
+	if(strstr($person['xchan_network'],'friendica'))
+		$app = 'Friendica';
+	else
+		$app = 'Diaspora';
+
+	$datarray['app']  = $app;
 	
 	if(! $parent_author_signature) {
 		$key = get_config('system','pubkey');

version.inc

@@ -1 +1 @@
-2014-11-19.864
+2014-11-20.865