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

diff --git a/doc/html/include_2chat_8php.js b/doc/html/include_2chat_8php.js
deleted file mode 100644
index 176f640cb..000000000
--- a/doc/html/include_2chat_8php.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var include_2chat_8php =
-[
-    [ "chat_message", "include_2chat_8php.html#acea6b176eb7aff44d9ba3ae24ce511d3", null ],
-    [ "chatroom_create", "include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422", null ],
-    [ "chatroom_destroy", "include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639", null ],
-    [ "chatroom_enter", "include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91", null ],
-    [ "chatroom_leave", "include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f", null ],
-    [ "chatroom_list", "include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a", null ],
-    [ "chatroom_list_count", "include_2chat_8php.html#a26abdccc2a278a59899896dbbfc6f049", null ]
-];
\ No newline at end of file