Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline...

diff --cc actions/hostmeta.php
Simple merge

diff --cc actions/userxrd.php
Simple merge

diff --cc config.php.sample
Simple merge

diff --cc lib/default.php
index 4a7d6110c5c95c5c648becf63e5655e7cdb6c44a,847610aea999dd81a33c7a8a112e88c36cdab6fa..51d62ed767de2ba735c8e8c83993076ce91d39cc
--- 1/lib/default.php
--- 2/lib/default.php
+++ b/lib/default.php
@@@ -61,9 -61,9 +61,10 @@@ $default 
                'textlimit' => 140,
                'indent' => true,
                'use_x_sendfile' => false,
+               'cors' => true,
                'notice' => null, // site wide notice text
                'build' => 1, // build number, for code-dependent cache
 +              'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development
                ),
          'db' =>
          array('database' => 'YOU HAVE TO SET THIS IN config.php',