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_6f.js b/doc/html/search/files_6f.js
deleted file mode 100644
index 28bf1071e..000000000
--- a/doc/html/search/files_6f.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var searchData=
-[
-  ['oauth_2ephp',['oauth.php',['../oauth_8php.html',1,'']]],
-  ['oembed_2ephp',['oembed.php',['../mod_2oembed_8php.html',1,'']]],
-  ['oembed_2ephp',['oembed.php',['../include_2oembed_8php.html',1,'']]],
-  ['oexchange_2ephp',['oexchange.php',['../oexchange_8php.html',1,'']]],
-  ['olddefault_2ephp',['olddefault.php',['../olddefault_8php.html',1,'']]],
-  ['onedirsync_2ephp',['onedirsync.php',['../onedirsync_8php.html',1,'']]],
-  ['onepoll_2ephp',['onepoll.php',['../onepoll_8php.html',1,'']]],
-  ['online_2ephp',['online.php',['../online_8php.html',1,'']]],
-  ['openid_2ephp',['openid.php',['../openid_8php.html',1,'']]],
-  ['opensearch_2ephp',['opensearch.php',['../opensearch_8php.html',1,'']]]
-];