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

diff --git a/doc/html/classRedFile.js b/doc/html/classRedFile.js
deleted file mode 100644
index 4f03440ad..000000000
--- a/doc/html/classRedFile.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var classRedFile =
-[
-    [ "__construct", "classRedFile.html#a9a67bdb34c9db6ce144b3f371148b183", null ],
-    [ "delete", "classRedFile.html#aef71c9eaac7052be7dc8602eb12171e7", null ],
-    [ "get", "classRedFile.html#a7c868dfcef6c70cd0e24cf3caa2c3535", null ],
-    [ "getContentType", "classRedFile.html#a26416827eb68554d033d1e2e5cc6dd3b", null ],
-    [ "getETag", "classRedFile.html#ae96d5caa2db7a461c57b24380fa87e28", null ],
-    [ "getLastModified", "classRedFile.html#a41562a28007789bbe7fe06d6a20eef47", null ],
-    [ "getName", "classRedFile.html#a0c961c5f49544d2502420361fa526437", null ],
-    [ "getSize", "classRedFile.html#acb1edbe1848fab05347746fa1ea09d8f", null ],
-    [ "put", "classRedFile.html#a41a49a583eb276b75626fcf97f4a699c", null ],
-    [ "setName", "classRedFile.html#a38a82bfc1b30028ea6ac75923e90fa25", null ],
-    [ "$auth", "classRedFile.html#a4b5d0e33f919c6c175b30a55de6263f2", null ],
-    [ "$data", "classRedFile.html#a2ff12032b45538353eded9809d3b7550", null ],
-    [ "$name", "classRedFile.html#acc48c05cd5a70951cb3c615ad84f03ba", null ]
-];
\ No newline at end of file