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

diff --git a/doc/html/search/files_69.js b/doc/html/search/files_69.js
deleted file mode 100644
index 8345e5929..000000000
--- a/doc/html/search/files_69.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var searchData=
-[
-  ['identity_2ephp',['identity.php',['../identity_8php.html',1,'']]],
-  ['impel_2ephp',['impel.php',['../impel_8php.html',1,'']]],
-  ['import_2ephp',['import.php',['../import_8php.html',1,'']]],
-  ['importelm_2ephp',['importelm.php',['../importelm_8php.html',1,'']]],
-  ['importer_2ephp',['Importer.php',['../Importer_8php.html',1,'']]],
-  ['invite_2ephp',['invite.php',['../invite_8php.html',1,'']]],
-  ['item_2ephp',['item.php',['../item_8php.html',1,'']]],
-  ['itemobject_2ephp',['ItemObject.php',['../ItemObject_8php.html',1,'']]],
-  ['itemplateengine_2ephp',['ITemplateEngine.php',['../ITemplateEngine_8php.html',1,'']]],
-  ['items_2ephp',['items.php',['../items_8php.html',1,'']]]
-];