From: Robin Appelman Date: Fri, 9 Jul 2010 11:43:40 +0000 (+0200) Subject: Merge git://gitorious.org/~icewind/owncloud/icewinds-owncloud into merge X-Git-Tag: v3.0~351 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=96e185f15033047b37a5dbb9c7d1467db6b5b8e1;p=nextcloud-server.git Merge git://gitorious.org/~icewind/owncloud/icewinds-owncloud into merge Conflicts: inc/MDB2/Driver/Function/pgsql.php inc/MDB2/Driver/Manager/mysql.php inc/MDB2/Driver/Reverse/pgsql.php inc/MDB2/Driver/mysql.php inc/lib_base.php --- 96e185f15033047b37a5dbb9c7d1467db6b5b8e1