Merge commit 'upstream/0.7.x' into 0.7.x

Conflicts:

	actions/showstream.php

diff --cc actions/showstream.php
index 3b4c97865bf6ca3498a252d00aa85e6470fe1eaf,28bb8453f8c1111dd04a44b9fcff947273fd146b..6bed700c2d4b374d6926c17533626c6ec5b3c3c4
--- 1/actions/showstream.php
--- 2/actions/showstream.php
+++ b/actions/showstream.php
@@@ -335,16 -338,17 +347,16 @@@ class ShowstreamAction extends Actio
                      $sf = new SubscribeForm($this, $this->profile);
                      $sf->show();
                  }
+                 $this->elementEnd('li');
              }
          } else {
+             $this->elementStart('li', 'entity_subscribe');
              $this->showRemoteSubscribeLink();
+             $this->elementEnd('li');
          }
-         $this->elementEnd('li');
- 
- //        common_profile_new_message_nudge($cur, $this->user, $this->profile);
  
 -        $user = User::staticGet('id', $this->profile->id);
          if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
-            $this->elementStart('li', array('class' => 'entity_send-a-message'));
+            $this->elementStart('li', 'entity_send-a-message');
              $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)),
                                        'title' => _('Send a direct message to this user')),
                             _('Message'));

diff --cc lib/imagefile.php
Simple merge