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

diff --git a/doc/html/search/files_64.js b/doc/html/search/files_64.js
deleted file mode 100644
index b844af86b..000000000
--- a/doc/html/search/files_64.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var searchData=
-[
-  ['dark_2ephp',['dark.php',['../dark_8php.html',1,'']]],
-  ['darkness_2ephp',['darkness.php',['../darkness_8php.html',1,'']]],
-  ['darknessleftaside_2ephp',['darknessleftaside.php',['../darknessleftaside_8php.html',1,'']]],
-  ['darknessrightaside_2ephp',['darknessrightaside.php',['../darknessrightaside_8php.html',1,'']]],
-  ['datetime_2ephp',['datetime.php',['../datetime_8php.html',1,'']]],
-  ['dav_2ephp',['dav.php',['../dav_8php.html',1,'']]],
-  ['db_5fupdate_2ephp',['db_update.php',['../db__update_8php.html',1,'']]],
-  ['dba_5fdriver_2ephp',['dba_driver.php',['../dba__driver_8php.html',1,'']]],
-  ['dba_5fmysql_2ephp',['dba_mysql.php',['../dba__mysql_8php.html',1,'']]],
-  ['dba_5fmysqli_2ephp',['dba_mysqli.php',['../dba__mysqli_8php.html',1,'']]],
-  ['dba_5fpostgres_2ephp',['dba_postgres.php',['../dba__postgres_8php.html',1,'']]],
-  ['default_2ephp',['default.php',['../theme_2mytheme_2php_2default_8php.html',1,'']]],
-  ['default_2ephp',['default.php',['../php_2default_8php.html',1,'']]],
-  ['delegate_2ephp',['delegate.php',['../delegate_8php.html',1,'']]],
-  ['deliver_2ephp',['deliver.php',['../deliver_8php.html',1,'']]],
-  ['diaspora_2ephp',['diaspora.php',['../diaspora_8php.html',1,'']]],
-  ['dimport_2ephp',['dimport.php',['../dimport_8php.html',1,'']]],
-  ['dir_5ffns_2ephp',['dir_fns.php',['../dir__fns_8php.html',1,'']]],
-  ['directory_2ephp',['directory.php',['../include_2directory_8php.html',1,'']]],
-  ['directory_2ephp',['directory.php',['../mod_2directory_8php.html',1,'']]],
-  ['dirsearch_2ephp',['dirsearch.php',['../dirsearch_8php.html',1,'']]],
-  ['display_2ephp',['display.php',['../display_8php.html',1,'']]],
-  ['docblox_5ferrorchecker_2ephp',['docblox_errorchecker.php',['../docblox__errorchecker_8php.html',1,'']]]
-];