Merge branch 'master' of https://github.com/annando/friendica

Conflicts:
	include/poller.php

diff --cc include/diaspora.php
Simple merge

diff --cc include/poller.php
index cc5f2a9834adabc75f8914cabcc8cbd165491d86,692335aab2f3cd3038cb306387bb96c4683a4267..c9c46188f632c9f555c4a7aa17e99fb59e66709e
--- 1/include/poller.php
--- 2/include/poller.php
+++ b/include/poller.php
@@@ -61,7 -61,11 +61,11 @@@ function poller_run(&$argv, &$argc)
        // run queue delivery process in the background
  
        proc_run('php',"include/queue.php");
 -      
 +
+       // run diaspora photo queue process in the background
+ 
+       proc_run('php',"include/dsprphotoq.php");
 -      
++
        // expire any expired accounts
  
        q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0