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

diff --git a/doc/html/dba_8php.js b/doc/html/dba_8php.js
deleted file mode 100644
index 92ae4c2e4..000000000
--- a/doc/html/dba_8php.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var dba_8php =
-[
-    [ "dba", "classdba.html", "classdba" ],
-    [ "dbesc", "dba_8php.html#ab222aa1dbf9ea93b320f82028739127e", null ],
-    [ "dbesc_array", "dba_8php.html#a65b83462bd26968106aebd43f16540e4", null ],
-    [ "dbesc_array_cb", "dba_8php.html#af531546fac5f0836a8557a4f6dfee930", null ],
-    [ "dbg", "dba_8php.html#aa6607893d8f60ade9122bcfbd1a53ffb", null ],
-    [ "dbq", "dba_8php.html#aa377074e70981e8c4e82ca0accd068ee", null ],
-    [ "printable", "dba_8php.html#a55bf30d8176967e682656b5be4ad9249", null ],
-    [ "q", "dba_8php.html#a2c09a731d3b4fef41fed0e83db01be1f", null ]
-];
\ No newline at end of file