Merge branch 'master' of gitorious.org:owncloud/owncloud

Conflicts:
	inc/lib_log.php

diff --cc inc/lib_log.php
index ce46e9a683d90225d83e6ff36e17c119b22a4b72,1244a44a9355ad785fcc67a225c5e0e61bcaa63c..989308c82fcfe02f19368aef11855163c59ad977
--- 1/inc/lib_log.php
--- 2/inc/lib_log.php
+++ b/inc/lib_log.php
@@@ -48,9 -48,7 +48,8 @@@ class OC_LOG 
     * @param message $message
     */
    public static function event($user,$type,$message){
 -    $result = OC_DB::query('insert into log (timestamp,user,type,message) values ("'.time().'","'.addslashes($user).'","'.addslashes($type).'","'.addslashes($message).'")');
 +      global $CONFIG_DBTABLEPREFIX;
 +    $result = OC_DB::query('INSERT INTO `' . $CONFIG_DBTABLEPREFIX . 'log` (`timestamp`,`user`,`type`,`message`) VALUES ('.time().',\''.addslashes($user).'\','.addslashes($type).',\''.addslashes($message).'\');');
-     OC_DB::free_result($result);
    }
  
  

diff --cc inc/lib_user.php
Simple merge