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

diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
deleted file mode 100644
index e2ce562ef..000000000
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
+++ /dev/null
@@ -1,104 +0,0 @@
-var dir_d44c64559bbebec7f509842c48db8b23 =
-[
-    [ "dba", "dir_21bc5169ff11430004758be31dcfc6c4.html", "dir_21bc5169ff11430004758be31dcfc6c4" ],
-    [ "Import", "dir_7edbbd0f8c514efef79942dcdc21f738.html", "dir_7edbbd0f8c514efef79942dcdc21f738" ],
-    [ "photo", "dir_aae29906d7bfc07d076125f669c8352e.html", "dir_aae29906d7bfc07d076125f669c8352e" ],
-    [ "RedDAV", "dir_e7f045be8bb383d8447c6a6b84145083.html", "dir_e7f045be8bb383d8447c6a6b84145083" ],
-    [ "account.php", "account_8php.html", "account_8php" ],
-    [ "acl_selectors.php", "acl__selectors_8php.html", "acl__selectors_8php" ],
-    [ "activities.php", "activities_8php.html", "activities_8php" ],
-    [ "api.php", "include_2api_8php.html", "include_2api_8php" ],
-    [ "apps.php", "include_2apps_8php.html", "include_2apps_8php" ],
-    [ "attach.php", "include_2attach_8php.html", "include_2attach_8php" ],
-    [ "auth.php", "auth_8php.html", "auth_8php" ],
-    [ "BaseObject.php", "BaseObject_8php.html", [
-      [ "BaseObject", "classBaseObject.html", "classBaseObject" ]
-    ] ],
-    [ "bb2diaspora.php", "bb2diaspora_8php.html", "bb2diaspora_8php" ],
-    [ "bbcode.php", "bbcode_8php.html", "bbcode_8php" ],
-    [ "bookmarks.php", "include_2bookmarks_8php.html", "include_2bookmarks_8php" ],
-    [ "cache.php", "cache_8php.html", [
-      [ "Cache", "classCache.html", null ]
-    ] ],
-    [ "chat.php", "include_2chat_8php.html", "include_2chat_8php" ],
-    [ "cli_startup.php", "cli__startup_8php.html", "cli__startup_8php" ],
-    [ "cli_suggest.php", "cli__suggest_8php.html", "cli__suggest_8php" ],
-    [ "comanche.php", "comanche_8php.html", "comanche_8php" ],
-    [ "config.php", "include_2config_8php.html", "include_2config_8php" ],
-    [ "Contact.php", "Contact_8php.html", "Contact_8php" ],
-    [ "contact_selectors.php", "contact__selectors_8php.html", "contact__selectors_8php" ],
-    [ "contact_widgets.php", "contact__widgets_8php.html", "contact__widgets_8php" ],
-    [ "conversation.php", "conversation_8php.html", "conversation_8php" ],
-    [ "ConversationObject.php", "ConversationObject_8php.html", [
-      [ "Conversation", "classConversation.html", "classConversation" ]
-    ] ],
-    [ "cronhooks.php", "cronhooks_8php.html", "cronhooks_8php" ],
-    [ "crypto.php", "crypto_8php.html", "crypto_8php" ],
-    [ "datetime.php", "datetime_8php.html", "datetime_8php" ],
-    [ "deliver.php", "deliver_8php.html", "deliver_8php" ],
-    [ "diaspora.php", "diaspora_8php.html", "diaspora_8php" ],
-    [ "dimport.php", "dimport_8php.html", "dimport_8php" ],
-    [ "dir_fns.php", "dir__fns_8php.html", "dir__fns_8php" ],
-    [ "directory.php", "include_2directory_8php.html", "include_2directory_8php" ],
-    [ "enotify.php", "enotify_8php.html", "enotify_8php" ],
-    [ "event.php", "event_8php.html", "event_8php" ],
-    [ "expire.php", "expire_8php.html", "expire_8php" ],
-    [ "externals.php", "externals_8php.html", "externals_8php" ],
-    [ "features.php", "features_8php.html", "features_8php" ],
-    [ "fixd.php", "fixd_8php.html", "fixd_8php" ],
-    [ "follow.php", "include_2follow_8php.html", "include_2follow_8php" ],
-    [ "gprobe.php", "gprobe_8php.html", "gprobe_8php" ],
-    [ "group.php", "include_2group_8php.html", "include_2group_8php" ],
-    [ "html2bbcode.php", "html2bbcode_8php.html", "html2bbcode_8php" ],
-    [ "html2plain.php", "html2plain_8php.html", "html2plain_8php" ],
-    [ "hubloc.php", "hubloc_8php.html", "hubloc_8php" ],
-    [ "identity.php", "identity_8php.html", "identity_8php" ],
-    [ "ItemObject.php", "ItemObject_8php.html", [
-      [ "Item", "classItem.html", "classItem" ]
-    ] ],
-    [ "ITemplateEngine.php", "ITemplateEngine_8php.html", [
-      [ "ITemplateEngine", "interfaceITemplateEngine.html", "interfaceITemplateEngine" ]
-    ] ],
-    [ "items.php", "items_8php.html", "items_8php" ],
-    [ "language.php", "language_8php.html", "language_8php" ],
-    [ "menu.php", "include_2menu_8php.html", "include_2menu_8php" ],
-    [ "message.php", "include_2message_8php.html", "include_2message_8php" ],
-    [ "nav.php", "nav_8php.html", "nav_8php" ],
-    [ "network.php", "include_2network_8php.html", "include_2network_8php" ],
-    [ "notifier.php", "notifier_8php.html", "notifier_8php" ],
-    [ "notify.php", "include_2notify_8php.html", "include_2notify_8php" ],
-    [ "oauth.php", "oauth_8php.html", "oauth_8php" ],
-    [ "oembed.php", "include_2oembed_8php.html", "include_2oembed_8php" ],
-    [ "onedirsync.php", "onedirsync_8php.html", "onedirsync_8php" ],
-    [ "onepoll.php", "onepoll_8php.html", "onepoll_8php" ],
-    [ "page_widgets.php", "page__widgets_8php.html", "page__widgets_8php" ],
-    [ "permissions.php", "permissions_8php.html", "permissions_8php" ],
-    [ "photos.php", "include_2photos_8php.html", "include_2photos_8php" ],
-    [ "plugin.php", "plugin_8php.html", "plugin_8php" ],
-    [ "poller.php", "poller_8php.html", "poller_8php" ],
-    [ "probe.php", "include_2probe_8php.html", "include_2probe_8php" ],
-    [ "profile_selectors.php", "profile__selectors_8php.html", "profile__selectors_8php" ],
-    [ "ProtoDriver.php", "ProtoDriver_8php.html", [
-      [ "ProtoDriver", "classProtoDriver.html", "classProtoDriver" ],
-      [ "ZotDriver", "classZotDriver.html", "classZotDriver" ]
-    ] ],
-    [ "queue.php", "queue_8php.html", "queue_8php" ],
-    [ "queue_fn.php", "queue__fn_8php.html", "queue__fn_8php" ],
-    [ "ratenotif.php", "ratenotif_8php.html", "ratenotif_8php" ],
-    [ "reddav.php", "reddav_8php.html", "reddav_8php" ],
-    [ "security.php", "security_8php.html", "security_8php" ],
-    [ "session.php", "session_8php.html", "session_8php" ],
-    [ "smarty.php", "smarty_8php.html", [
-      [ "FriendicaSmarty", "classFriendicaSmarty.html", "classFriendicaSmarty" ],
-      [ "FriendicaSmartyEngine", "classFriendicaSmartyEngine.html", "classFriendicaSmartyEngine" ]
-    ] ],
-    [ "socgraph.php", "socgraph_8php.html", "socgraph_8php" ],
-    [ "spam.php", "spam_8php.html", "spam_8php" ],
-    [ "statistics_fns.php", "statistics__fns_8php.html", "statistics__fns_8php" ],
-    [ "system_unavailable.php", "system__unavailable_8php.html", "system__unavailable_8php" ],
-    [ "taxonomy.php", "taxonomy_8php.html", "taxonomy_8php" ],
-    [ "template_processor.php", "template__processor_8php.html", "template__processor_8php" ],
-    [ "text.php", "text_8php.html", "text_8php" ],
-    [ "widgets.php", "widgets_8php.html", "widgets_8php" ],
-    [ "zot.php", "zot_8php.html", "zot_8php" ]
-];
\ No newline at end of file