Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
	lib/default.php
	lib/util.php
	plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/default.php b/lib/default.php
index 52a4ec783..754cf5728 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -309,5 +309,8 @@ $default =
         'url' =>
         array('shortener' => 'ur1.ca',
               'maxlength' => 25,
-              'maxnoticelength' => -1)
+              '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')
+              ),
         );