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/classRedMatrix_1_1RedDAV_1_1RedBrowser.js b/doc/html/classRedMatrix_1_1RedDAV_1_1RedBrowser.js
deleted file mode 100644
index 849cba824..000000000
--- a/doc/html/classRedMatrix_1_1RedDAV_1_1RedBrowser.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var classRedMatrix_1_1RedDAV_1_1RedBrowser =
-[
-    [ "__construct", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a8161f2a0be205412e263c947b5ec46c5", null ],
-    [ "findAttachHash", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html#ad4bc0516533c62733f38043a37267d78", null ],
-    [ "findAttachIdByHash", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a0733e38e254474d9a456825e72f1ddfd", null ],
-    [ "generateDirectoryIndex", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html#af764d5f14df751f9ec86c34fab300c09", null ],
-    [ "getAssetUrl", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html#acaa792c08d24e9dc2919759e92ba037d", null ],
-    [ "htmlActionsPanel", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html#a3bd98af2d1cdfd8f26deb914596176cf", null ],
-    [ "set_writeable", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html#aa1607857cb59738c4dce2fe8e73d8f19", null ],
-    [ "$auth", "classRedMatrix_1_1RedDAV_1_1RedBrowser.html#ad19179bf4ac7f18fafa7e2e3df800142", null ]
-];
\ No newline at end of file