Merge commit 'origin/0.9.x' into 0.9.x

diff --combined config.php.sample
index 97645e870a35db7b99adeff200ea9d1ba4ea1e9c,91e6614c0659ca404a7ebca0e712c2371a7510ed..63daf8663cfc2b8e750ea3ee54d078bf30191a7f
--- 1/config.php.sample
--- 2/config.php.sample
+++ b/config.php.sample
@@@ -154,7 -154,7 +154,7 @@@ $config['sphinx']['port'] = 3312
  // $config['queue']['subsystem'] = 'stomp';
  // $config['queue']['stomp_server'] = 'tcp://localhost:61613';
  // use different queue_basename for each statusnet instance managed by the server
- // $config['queue']['queue_basename'] = 'statusnet';
+ // $config['queue']['queue_basename'] = '/queue/statusnet/';
  
  // The following customise the behaviour of the various daemons:
  // $config['daemon']['piddir'] = '/var/run';
@@@ -186,7 -186,7 +186,7 @@@
  //
  // $config['twitterbridge']['enabled'] = true;
  
 -// Twitter OAuth settings
 +// Twitter OAuth settings. Documentation is at http://apiwiki.twitter.com/OAuth-FAQ
  // $config['twitter']['consumer_key']    = 'YOURKEY';
  // $config['twitter']['consumer_secret'] = 'YOURSECRET';
  
@@@ -236,6 -236,11 +236,11 @@@
  // Use a different hostname for SSL-encrypted pages
  // $config['site']['sslserver'] = 'secure.example.org';
  
+ // Indent HTML and XML
+ // Enable (default) for easier to read markup for developers,
+ // disable to save some bandwidth.
+ // $config['site']['indent'] = true;
+ 
  // If you have a lot of status networks on the same server, you can
  // store the site data in a database and switch as follows
  // Status_network::setupDB('localhost', 'statusnet', 'statuspass', 'statusnet');