Merge branch '0.9.x' into 1.0.x

diff --cc actions/subscriptions.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc classes/Profile.php
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc lib/router.php
Simple merge

diff --cc plugins/Mapstraction/MapstractionPlugin.php
index d1a7bd0edfebe72c63723acad096350fd7c1452d,020c0818ad20b055b778ad830c38ebf1616c3ca2..d5b4e5052bb44df472280239dd19e4b3953fd8a6
--- 1/plugins/Mapstraction/MapstractionPlugin.php
--- 2/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@@ -125,11 -125,11 +125,11 @@@ class MapstractionPlugin extends Plugi
                                      urlencode($this->apikey)));
              break;
          case 'microsoft':
 -            $action->script('http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
 +            $action->script((StatusNet::isHTTPS()?'https':'http') + '://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
              break;
          case 'openlayers':
-             // XXX: is this not nice...?
-             $action->script('http://openlayers.org/api/OpenLayers.js');
+             // Use our included stripped & minified OpenLayers.
+             $action->script(common_path('plugins/Mapstraction/OpenLayers/OpenLayers.js'));
              break;
          case 'yahoo':
              $action->script(sprintf('http://api.maps.yahoo.com/ajaxymap?v=3.8&appid=%s',