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

diff --git a/doc/html/search/files_63.js b/doc/html/search/files_63.js
deleted file mode 100644
index f15bd328a..000000000
--- a/doc/html/search/files_63.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var searchData=
-[
-  ['cache_2ephp',['cache.php',['../cache_8php.html',1,'']]],
-  ['channel_2ephp',['channel.php',['../channel_8php.html',1,'']]],
-  ['chanview_2ephp',['chanview.php',['../chanview_8php.html',1,'']]],
-  ['chat_2ephp',['chat.php',['../mod_2chat_8php.html',1,'']]],
-  ['chat_2ephp',['chat.php',['../include_2chat_8php.html',1,'']]],
-  ['chatsvc_2ephp',['chatsvc.php',['../chatsvc_8php.html',1,'']]],
-  ['choklet_2ephp',['choklet.php',['../choklet_8php.html',1,'']]],
-  ['cli_5fstartup_2ephp',['cli_startup.php',['../cli__startup_8php.html',1,'']]],
-  ['cli_5fsuggest_2ephp',['cli_suggest.php',['../cli__suggest_8php.html',1,'']]],
-  ['cloud_2ephp',['cloud.php',['../cloud_8php.html',1,'']]],
-  ['comanche_2ephp',['comanche.php',['../comanche_8php.html',1,'']]],
-  ['common_2ephp',['common.php',['../common_8php.html',1,'']]],
-  ['config_2emd',['config.md',['../config_8md.html',1,'']]],
-  ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]],
-  ['config_2ephp',['config.php',['../view_2theme_2apw_2php_2config_8php.html',1,'']]],
-  ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]],
-  ['connect_2ephp',['connect.php',['../connect_8php.html',1,'']]],
-  ['connections_2ephp',['connections.php',['../connections_8php.html',1,'']]],
-  ['connedit_2ephp',['connedit.php',['../connedit_8php.html',1,'']]],
-  ['contact_2ephp',['Contact.php',['../Contact_8php.html',1,'']]],
-  ['contact_5fselectors_2ephp',['contact_selectors.php',['../contact__selectors_8php.html',1,'']]],
-  ['contact_5fwidgets_2ephp',['contact_widgets.php',['../contact__widgets_8php.html',1,'']]],
-  ['contactgroup_2ephp',['contactgroup.php',['../contactgroup_8php.html',1,'']]],
-  ['conversation_2ephp',['conversation.php',['../conversation_8php.html',1,'']]],
-  ['conversationobject_2ephp',['ConversationObject.php',['../ConversationObject_8php.html',1,'']]],
-  ['cronhooks_2ephp',['cronhooks.php',['../cronhooks_8php.html',1,'']]],
-  ['crypto_2ephp',['crypto.php',['../crypto_8php.html',1,'']]]
-];