Merge branch 'master' into 1.0.x

diff --cc README
Simple merge

diff --cc classes/File_redirection.php
Simple merge

diff --cc lib/common.php
Simple merge

diff --cc lib/default.php
index e0081f3165e5a1001fc009e460d5d7ec1e23b26e,45a4560ff36100ccda3890267d51615ac1a3a9cd..76e4e44cf2b17a43e57c86a68eae916f6353a98b
--- 1/lib/default.php
--- 2/lib/default.php
+++ b/lib/default.php
@@@ -316,11 -314,8 +316,12 @@@ $default 
          array('subscribers' => true,
                'members' => true,
                'peopletag' => true),
 +        'url' =>
 +        array('shortener' => 'ur1.ca',
 +              'maxlength' => 25,
 +              'maxnoticelength' => -1),
          'http' => // HTTP client settings when contacting other sites
-         array('ssl_cafile' => false // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')
+         array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')
+               'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.)
                ),
          );

diff --cc lib/statusnet.php
Simple merge

diff --cc lib/util.php
Simple merge