Merge remote branch 'statusnet/0.9.x' into 1.0.x

diff --cc EVENTS.txt
Simple merge

diff --cc README
Simple merge

diff --cc lib/apiaction.php
Simple merge

diff --cc lib/connectsettingsaction.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/htmloutputter.php
Simple merge

diff --cc lib/statusnet.php
index 39f90a5069dffb7a3cd67ff2bba3cd9e5c4ab28d,301994508de630401b1645f010a6e91bfc77dc92..3d018f4e211b54e0f0ebc00d236fbefcf04df55d
--- 1/lib/statusnet.php
--- 2/lib/statusnet.php
+++ b/lib/statusnet.php
@@@ -371,22 -366,19 +370,34 @@@ class StatusNe
                  $config['cache']['base'] = $config['memcached']['base'];
              }
          }
 +        if (array_key_exists('xmpp', $config)) {
 +            if ($config['xmpp']['enabled']) {
 +                addPlugin('xmpp', array(
 +                    'server' => $config['xmpp']['server'],
 +                    'port' => $config['xmpp']['port'],
 +                    'user' => $config['xmpp']['user'],
 +                    'resource' => $config['xmpp']['resource'],
 +                    'encryption' => $config['xmpp']['encryption'],
 +                    'password' => $config['xmpp']['password'],
 +                    'host' => $config['xmpp']['host'],
 +                    'debug' => $config['xmpp']['debug'],
 +                    'public' => $config['xmpp']['public']
 +                ));
 +            }
 +        }
      }
+ 
+     /**
+      * Are we running from the web with HTTPS?
+      *
+      * @return boolean true if we're running with HTTPS; else false
+      */
+ 
+     static function isHTTPS()
+     {
+         // There are some exceptions to this; add them here!
+         return $_SERVER['HTTPS'];
+     }
  }
  
  class NoConfigException extends Exception