Merge branch '0.9.x' into 1.0.x

diff --combined actions/showstream.php
index cb9ade19133c959264ab8bb66749564af5566026,c529193860ff886d02b937514f9f8474b9b2af3b..4d09a2d4eb6be451af15204bf2feb4fe68ed8af2
--- 1/actions/showstream.php
--- 2/actions/showstream.php
+++ b/actions/showstream.php
@@@ -166,6 -166,12 +166,6 @@@ class ShowstreamAction extends ProfileA
              $this->element('meta', array('name' => 'microid',
                                           'content' => $id->toString()));
          }
 -        if ($this->user->jabbermicroid && $this->user->jabber && $this->profile->profileurl) {
 -            $id = new Microid('xmpp:'.$this->user->jabber,
 -                              $this->selfUrl());
 -            $this->element('meta', array('name' => 'microid',
 -                                         'content' => $id->toString()));
 -        }
  
          // See https://wiki.mozilla.org/Microsummaries
  
@@@ -285,23 -291,6 +285,6 @@@ class ProfileNoticeListItem extends Not
  
              $this->out->elementStart('span', 'repeat');
  
-             $this->out->elementStart('a', $attrs);
- 
-             $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
- 
-             $this->out->element('img', array('src' => ($avatar) ?
-                                              $avatar->displayUrl() :
-                                              Avatar::defaultImage(AVATAR_MINI_SIZE),
-                                              'class' => 'avatar photo',
-                                              'width' => AVATAR_MINI_SIZE,
-                                              'height' => AVATAR_MINI_SIZE,
-                                              'alt' =>
-                                              ($this->profile->fullname) ?
-                                              $this->profile->fullname :
-                                              $this->profile->nickname));
- 
-             $this->out->elementEnd('a');
- 
              $text_link = XMLStringer::estring('a', $attrs, $this->profile->nickname);
  
              $this->out->raw(sprintf(_('Repeat of %s'), $text_link));