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

diff --git a/doc/html/classRedInode.js b/doc/html/classRedInode.js
deleted file mode 100644
index 6bf4d5840..000000000
--- a/doc/html/classRedInode.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var classRedInode =
-[
-    [ "__construct", "classRedInode.html#a21a6f92921c037c868e6fae30c7c51bb", null ],
-    [ "delete", "classRedInode.html#a5e8f09bc887725c3c448f8d72fe3edfc", null ],
-    [ "getLastModified", "classRedInode.html#a8503d4f247186e9e55bc42b37e067fb6", null ],
-    [ "getName", "classRedInode.html#aec5706105400764124db39d4bc68d458", null ],
-    [ "setName", "classRedInode.html#a3d76322f25d847b123b3df37a26dd04e", null ],
-    [ "$attach", "classRedInode.html#a7b317eb1230930154107ed51e54193f5", null ]
-];
\ No newline at end of file