Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts:
	include/zot.php
	util/messages.po

include/zot.php

@@ -1539,9 +1539,6 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 
 		$tag_delivery = tgroup_check($channel['channel_id'],$arr);
 
-
-//		$perm = (($arr['mid'] == $arr['parent_mid']) ? 'send_stream' : 'post_comments');
-
 		$perm = 'send_stream';
 		if(($arr['mid'] !== $arr['parent_mid']) && ($relay))
 			$perm = 'post_comments';