Merge branch '0.9.x' into 1.0.x

Conflicts:
	README
	lib/default.php

diff --cc README
index 0ee83a9ee8f13eb84f248e3025f511fbfffcc55e,35c510e2b8d4b972c11c24d03e49187f24a6606b..d69ec8fdd024e3f0652046d002abbcf088105c04
--- 1/README
--- 2/README
+++ b/README
@@@ -1499,22 -1502,33 +1500,49 @@@ disallow: Array of (virtual) directorie
      'search', 'message', 'settings', 'admin'. Ignored when site
      is private, in which case the entire site ('/') is disallowed.
  
+ api
+ ---
+ 
+ Options for the Twitter-like API.
+ 
+ realm: HTTP Basic Auth realm (see http://tools.ietf.org/html/rfc2617
+     for details). Some third-party tools like ping.fm want this to be
+     'Identi.ca API', so set it to that if you want to. default = null,
+     meaning 'something based on the site name'.
+ 
+ nofollow
+ --------
+ 
+ We optionally put 'rel="nofollow"' on some links in some pages. The
+ following configuration settings let you fine-tune how or when things
+ are nofollowed. See http://en.wikipedia.org/wiki/Nofollow for more
+ information on what 'nofollow' means.
+ 
+ subscribers: whether to nofollow links to subscribers on the profile
+     and personal pages. Default is true.
+ members: links to members on the group page. Default true.
+ peopletag: links to people listed in the peopletag page. Default true.
+ external: external links in notices. One of three values: 'sometimes',
+     'always', 'never'. If 'sometimes', then external links are not
+     nofollowed on profile, notice, and favorites page. Default is
+     'sometimes'.
+ 
 +url
 +---
 +
 +Everybody loves URL shorteners. These are some options for fine-tuning
 +how and when the server shortens URLs.
 +
 +shortener: URL shortening service to use by default. Users can override
 +           individually. 'ur1.ca' by default.
 +maxlength: If an URL is strictly longer than this limit, it will be
 +           shortened. Note that the URL shortener service may return an
 +           URL longer than this limit. Defaults to 25. Users can
 +           override. If set to 0, all URLs will be shortened.
 +maxnoticelength: If a notice is strictly longer than this limit, all
 +           URLs in the notice will be shortened. Users can override.
 +           -1 means the text limit for notices.
 +
  Plugins
  =======
  

diff --cc actions/shownotice.php
Simple merge

diff --cc actions/showstream.php
Simple merge

diff --cc lib/default.php
index 279a7a3d11f0106949052c90298bfaeb8eb74291,a19453fce49ddb3ec2edcd61f78e42f9220b395f..a1dac7b5e1110590d5d01b9c9deb5ba5954b5e0b
--- 1/lib/default.php
--- 2/lib/default.php
+++ b/lib/default.php
@@@ -319,11 -317,8 +319,12 @@@ $default 
          'nofollow' =>
          array('subscribers' => true,
                'members' => true,
-               'peopletag' => true),
+               'peopletag' => true,
+               'external' => 'sometimes'), // Options: 'sometimes', 'never', default = 'sometimes'
 +        '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')
                'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.)

diff --cc lib/util.php
Simple merge