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

diff --git a/doc/html/search/files_68.js b/doc/html/search/files_68.js
deleted file mode 100644
index faa72e163..000000000
--- a/doc/html/search/files_68.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var searchData=
-[
-  ['hcard_2ephp',['hcard.php',['../hcard_8php.html',1,'']]],
-  ['help_2ephp',['help.php',['../help_8php.html',1,'']]],
-  ['home_2ephp',['home.php',['../home_8php.html',1,'']]],
-  ['hostxrd_2ephp',['hostxrd.php',['../hostxrd_8php.html',1,'']]],
-  ['html2bbcode_2ephp',['html2bbcode.php',['../html2bbcode_8php.html',1,'']]],
-  ['html2plain_2ephp',['html2plain.php',['../html2plain_8php.html',1,'']]],
-  ['hubloc_2ephp',['hubloc.php',['../hubloc_8php.html',1,'']]]
-];