Merge remote branch 'upstream/master'

Conflicts:
	libertree/libertree.php

diff --cc facebook/facebook.php
Simple merge

diff --cc libertree/libertree.php
index 4b55a5e7022d876c8ad3fd1655eeaed72ec08e58,0e7e1a8191b2491ed96f257bc49841ad40ac9eb2..fcd0fa5ce5590a6daf21a445280e590bfc01d44d
--- 1/libertree/libertree.php
--- 2/libertree/libertree.php
+++ b/libertree/libertree.php
@@@ -194,10 -193,11 +193,11 @@@ function libertree_send(&$a,&$b) 
                // Adding the title
                if(strlen($title))
                        $body = "## ".html_entity_decode($title)."\n\n".$body;
 -              
 +
+ 
                $params = array(
                        'text' => $body,
-                       'source' => "friendica"
+                       'source' => $ltree_source
                //      'token' => $ltree_api_token
                );