Merge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the uninte...

diff --cc lib/util.php
index 5d16e39b56a2214d9d5321c9cad1a88616bad47f,ab5e99593ee75a151562125827993b120b23364b..e0eda0114b7101e046c55df94a3cb95919550bd4
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -1321,17 -1326,3 +1326,16 @@@ function common_compatible_license($fro
      // XXX: better compatibility check needed here!
      return ($from == $to);
  }
- 
 +
 +/**
 + * returns a quoted table name, if required according to config
 + */
 +function common_database_tablename($tablename)
 +{
 +  
 +  if(common_config('db','quote_identifiers')) {
 +      $tablename = '"'. $tablename .'"';
 +  }
 +  //table prefixes could be added here later
 +  return $tablename;
 +}

diff --cc scripts/xmppdaemon.php
Simple merge