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

diff --git a/doc/html/event_8php.js b/doc/html/event_8php.js
deleted file mode 100644
index f95c17696..000000000
--- a/doc/html/event_8php.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var event_8php =
-[
-    [ "bbtoevent", "event_8php.html#a180cccd63c2a2f00ff432b03113531f3", null ],
-    [ "bbtovcal", "event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279", null ],
-    [ "ev_compare", "event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850", null ],
-    [ "event_addtocal", "event_8php.html#ac9f206819186b65952ac1869f0da8c6e", null ],
-    [ "event_store_event", "event_8php.html#af5ac41e7ea3f7131088fe6333fd2846c", null ],
-    [ "event_store_item", "event_8php.html#a7378e839ac3de9d55579eb3ec48eaf92", null ],
-    [ "format_event_bbcode", "event_8php.html#abb74206cf42d694307c3d7abb7af9869", null ],
-    [ "format_event_html", "event_8php.html#a2ac9f1b08de03250ecd794f705781d17", null ],
-    [ "format_event_ical", "event_8php.html#a3ff7f1824540a38f4a3991a59a9542d4", null ],
-    [ "format_ical_text", "event_8php.html#a05073cd4ab837bd4a0149e8ed23ce688", null ],
-    [ "ical_wrapper", "event_8php.html#ab8cc2825013e724dc26229026711cf93", null ],
-    [ "sort_by_date", "event_8php.html#a018ea4484910a873a7c1eaa126de9b1a", null ]
-];
\ No newline at end of file