Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 0 insertions, 27 deletions

diff --git a/doc/html/classdba__driver.js b/doc/html/classdba__driver.js
deleted file mode 100644
index ea24b64f9..000000000
--- a/doc/html/classdba__driver.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var classdba__driver =
-[
-    [ "__construct", "classdba__driver.html#af3541d13ccb7a3eddfc03e253c746186", null ],
-    [ "__destruct", "classdba__driver.html#a1a8bc9dc839a6320a0e07d8047a6b721", null ],
-    [ "close", "classdba__driver.html#a5afa54172f3c837df61643f8f5b2c975", null ],
-    [ "concat", "classdba__driver.html#ab9982f38a02f008b127a0f3ccc1e99f4", null ],
-    [ "connect", "classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc", null ],
-    [ "dbg", "classdba__driver.html#adcc1f8955120fec0708bce39202d0422", null ],
-    [ "escape", "classdba__driver.html#afc95ffa103a3290581b537670cde5311", null ],
-    [ "escapebin", "classdba__driver.html#a7dbe8318587ff1694825042bf58f4fbd", null ],
-    [ "get_install_script", "classdba__driver.html#a8d6a79d39d7eaee5aea4e952c4529d48", null ],
-    [ "get_null_date", "classdba__driver.html#a65a5c7b355ab5529a43049e160006426", null ],
-    [ "getdriver", "classdba__driver.html#a02165fc4bee63d040ebd963a4fa82a14", null ],
-    [ "install", "classdba__driver.html#a4ccb27243e62a8ca30dd8e1b8cc67746", null ],
-    [ "optimize_table", "classdba__driver.html#a77e59dcbeab30ca6000131d2e9ad4092", null ],
-    [ "q", "classdba__driver.html#a558e738b88ae893cc5d79ffa3793d555", null ],
-    [ "quote_interval", "classdba__driver.html#ac9127e9c55fcc93bcfbb323b9b99b9d9", null ],
-    [ "unescapebin", "classdba__driver.html#ab43184239e1d6eb00a98319f4a3df155", null ],
-    [ "utcnow", "classdba__driver.html#ad700712879719bee23752b8f424d97d0", null ],
-    [ "$connected", "classdba__driver.html#a205f6535e399700b6fca2492f96f2229", null ],
-    [ "$db", "classdba__driver.html#a3033b5f1c2716b52202faeaae2592fe6", null ],
-    [ "$debug", "classdba__driver.html#af48e2afeded5285766bf92e22123ed03", null ],
-    [ "$error", "classdba__driver.html#a84675d28c7bd9b7290dd37e66dbd216c", null ],
-    [ "INSTALL_SCRIPT", "classdba__driver.html#a98d8523dcedda316085b4d4f856b6583", null ],
-    [ "NULL_DATE", "classdba__driver.html#afce39394c010ea589d99a21579b2c31e", null ],
-    [ "UTC_NOW", "classdba__driver.html#aa3325d982d4ee5d1114fd7e02a4356e8", null ]
-];
\ No newline at end of file