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

diff --git a/doc/html/search/files_73.js b/doc/html/search/files_73.js
deleted file mode 100644
index 0e11a6781..000000000
--- a/doc/html/search/files_73.js
+++ /dev/null
@@ -1,37 +0,0 @@
-var searchData=
-[
-  ['search_2ephp',['search.php',['../search_8php.html',1,'']]],
-  ['search_5fac_2ephp',['search_ac.php',['../search__ac_8php.html',1,'']]],
-  ['security_2ephp',['security.php',['../security_8php.html',1,'']]],
-  ['service_5flimits_2ephp',['service_limits.php',['../service__limits_8php.html',1,'']]],
-  ['session_2ephp',['session.php',['../session_8php.html',1,'']]],
-  ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]],
-  ['setup_2ephp',['setup.php',['../setup_8php.html',1,'']]],
-  ['share_2ephp',['share.php',['../share_8php.html',1,'']]],
-  ['sharedwithme_2ephp',['sharedwithme.php',['../sharedwithme_8php.html',1,'']]],
-  ['simple_5fblack_5fon_5fwhite_2ephp',['simple_black_on_white.php',['../simple__black__on__white_8php.html',1,'']]],
-  ['simple_5fgreen_5fon_5fblack_2ephp',['simple_green_on_black.php',['../simple__green__on__black_8php.html',1,'']]],
-  ['simple_5fwhite_5fon_5fblack_2ephp',['simple_white_on_black.php',['../simple__white__on__black_8php.html',1,'']]],
-  ['siteinfo_2ephp',['siteinfo.php',['../siteinfo_8php.html',1,'']]],
-  ['sitelist_2ephp',['sitelist.php',['../sitelist_8php.html',1,'']]],
-  ['smarty_2ephp',['smarty.php',['../smarty_8php.html',1,'']]],
-  ['smilies_2ephp',['smilies.php',['../smilies_8php.html',1,'']]],
-  ['socgraph_2ephp',['socgraph.php',['../socgraph_8php.html',1,'']]],
-  ['sources_2ephp',['sources.php',['../sources_8php.html',1,'']]],
-  ['spam_2ephp',['spam.php',['../spam_8php.html',1,'']]],
-  ['sslify_2ephp',['sslify.php',['../sslify_8php.html',1,'']]],
-  ['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]],
-  ['statistics_5ffns_2ephp',['statistics_fns.php',['../statistics__fns_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../suckerberg_2php_2style_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../sunbeam_2php_2style_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../yolo_2php_2style_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../hivenet_2php_2style_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../sporadic_2php_2style_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../stumble_2php_2style_8php.html',1,'']]],
-  ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]],
-  ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]],
-  ['system_5funavailable_2ephp',['system_unavailable.php',['../system__unavailable_8php.html',1,'']]]
-];