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

diff --git a/doc/html/classRedDirectory.js b/doc/html/classRedDirectory.js
deleted file mode 100644
index d54fb405a..000000000
--- a/doc/html/classRedDirectory.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var classRedDirectory =
-[
-    [ "__construct", "classRedDirectory.html#a1e35e3cd31d2a15250655e4cafdea180", null ],
-    [ "childExists", "classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec", null ],
-    [ "createDirectory", "classRedDirectory.html#a986936910f0216887a25e28916c166c7", null ],
-    [ "createFile", "classRedDirectory.html#a2d12d99d38a6a75fc9a830b2f7fc0bf0", null ],
-    [ "getChild", "classRedDirectory.html#aaa20f0f44da23781917af8170c0a2569", null ],
-    [ "getChildren", "classRedDirectory.html#aa42d3065f6f065b17db87146a7cb031a", null ],
-    [ "getDir", "classRedDirectory.html#a70173d4458572d95e586b2037d2fd2f4", null ],
-    [ "getLastModified", "classRedDirectory.html#a6c7e08199abc24e6eeb94a4037ef8bfc", null ],
-    [ "getName", "classRedDirectory.html#af6e4475dbd5abcdede00d20b8d388583", null ],
-    [ "getQuotaInfo", "classRedDirectory.html#a2f7a574f2115f099d6dd103d5b252375", null ],
-    [ "log", "classRedDirectory.html#a11376aed1963b4471eb1592c13c63976", null ],
-    [ "setName", "classRedDirectory.html#adc48035679e52c55d9881f83de535553", null ],
-    [ "$auth", "classRedDirectory.html#a9616af16cd19a18a6afebebcc2881c44", null ],
-    [ "$ext_path", "classRedDirectory.html#a0f113244cd85c17848df991001d024f4", null ],
-    [ "$folder_hash", "classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b", null ],
-    [ "$os_path", "classRedDirectory.html#a3c148c07ad909985125aa4926d8d0021", null ],
-    [ "$red_path", "classRedDirectory.html#acb32b8df27538c57772824a745e751d7", null ],
-    [ "$root_dir", "classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4", null ]
-];
\ No newline at end of file