Merge branch 'master' of gitorious.org:statusnet/mainline

lib/profileblock.php

@@ -127,6 +127,7 @@ abstract class ProfileBlock extends Widget
         if (!empty($homepage)) {
             $this->out->element('a',
                                 array('href' => $homepage,
+                                      'rel' => 'me',
                                       'class' => 'profile_block_homepage'),
                                 $homepage);
         }

plugins/RegisterThrottle/RegisterThrottlePlugin.php

@@ -223,6 +223,7 @@ class RegisterThrottlePlugin extends Plugin
     private function _getIpAddress()
     {
         $keys = array('HTTP_X_FORWARDED_FOR',
+                      'HTTP_X_CLIENT',
                       'CLIENT-IP',
                       'REMOTE_ADDR');