Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

Conflicts:
	config.php.sample

diff --combined lib/common.php
index 3f8123c51cfd3a5486b6d5f926e476fbe6841ed9,abdc22c0e324dae9bb522747a4789d150485a89c..3feba1d8bd95dd845045ac506ca700f722097268
--- 1/lib/common.php
--- 2/lib/common.php
+++ b/lib/common.php
@@@ -19,7 -19,7 +19,7 @@@
  
  if (!defined('LACONICA')) { exit(1); }
  
 -define('LACONICA_VERSION', '0.7.3');
 +define('LACONICA_VERSION', '0.8.0dev');
  
  define('AVATAR_PROFILE_SIZE', 96);
  define('AVATAR_STREAM_SIZE', 48);
@@@ -143,6 -143,8 +143,8 @@@ $config 
          array('piddir' => '/var/run',
                'user' => false,
                'group' => false),
+         'twitterbridge' =>
+         array('enabled' => false),
          'integration' =>
          array('source' => 'Laconica', # source attribute for Twitter
                'taguri' => $_server.',2009'), # base for tag URIs
@@@ -193,7 -195,7 +195,7 @@@ $_config_files[] = INSTALLDIR.'/config.
  $_have_a_config = false;
  
  foreach ($_config_files as $_config_file) {
-     if (file_exists($_config_file)) {
+     if (@file_exists($_config_file)) {
          include_once($_config_file);
          $_have_a_config = true;
      }