Merge branch 'pull'

diff --combined include/text.php
index b2c7862ce1dd2adbaf9a0923231c935ff9adc955,044ee4e085a9cd2dd5045b4793c1d0ddf9c66814..5ef870fd75225d65da744628f00d84ae97fd5893
--- 1/include/text.php
--- 2/include/text.php
+++ b/include/text.php
@@@ -759,7 -759,7 +759,7 @@@ function smilies($s, $sample = false) 
                '<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
                '<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
                '<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
-               '<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
+               '<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
                '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
  
        );
@@@ -776,11 -776,13 +776,11 @@@
        else {
                $s = str_replace($params['texts'],$params['icons'],$params['string']);
        }
 -             
 +
        return $s;
  
  }}
  
 -
 -
  if(! function_exists('day_translate')) {
  function day_translate($s) {
        $ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),