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, 14 deletions

diff --git a/doc/html/classdba.js b/doc/html/classdba.js
deleted file mode 100644
index 2b97b91eb..000000000
--- a/doc/html/classdba.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var classdba =
-[
-    [ "__construct", "classdba.html#aa36df91d776eedd1b90b9518a610d9fb", null ],
-    [ "__destruct", "classdba.html#ac25853e4d454aec9cfead4814429550d", null ],
-    [ "dbg", "classdba.html#a2c6fecf396c66e07f00276fc18d31ca7", null ],
-    [ "escape", "classdba.html#a522329687ff042074c1cbc8bd3226d2f", null ],
-    [ "getdb", "classdba.html#a066ce6eab1282c9220ac4652ac2dbd27", null ],
-    [ "q", "classdba.html#a0060c8611e3c3ee71049904ad028a695", null ],
-    [ "$connected", "classdba.html#a986eb5c3bbd4c70801a9ddd2f8e5c561", null ],
-    [ "$db", "classdba.html#ab57b3a4399f22ce5cdafbd3cd542a414", null ],
-    [ "$debug", "classdba.html#a4da56b3eb82ad26ba49ca5f97e1490cb", null ],
-    [ "$error", "classdba.html#a6a1471c18c6530044d20db5d3532958b", null ],
-    [ "$mysqli", "classdba.html#ab5dcbd758d3f8fb84702c323cd85067e", null ]
-];
\ No newline at end of file