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

diff --git a/doc/html/classdba__mysql.js b/doc/html/classdba__mysql.js
deleted file mode 100644
index ec4c52eaf..000000000
--- a/doc/html/classdba__mysql.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var classdba__mysql =
-[
-    [ "close", "classdba__mysql.html#a850586714ef897bd25f643c89b4ef76e", null ],
-    [ "connect", "classdba__mysql.html#a1887338627ce0e28786839363014bd0b", null ],
-    [ "escape", "classdba__mysql.html#a99a7691ea6cb1300031fb6549379066e", null ],
-    [ "getdriver", "classdba__mysql.html#a31011edd67b6b394355bf04cedb498d0", null ],
-    [ "q", "classdba__mysql.html#ac3fd60c278f400907322dac578754a99", null ]
-];
\ No newline at end of file