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_62.js b/doc/html/search/files_62.js
deleted file mode 100644
index e8e37db19..000000000
--- a/doc/html/search/files_62.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var searchData=
-[
-  ['baseobject_2ephp',['BaseObject.php',['../BaseObject_8php.html',1,'']]],
-  ['bb2diaspora_2ephp',['bb2diaspora.php',['../bb2diaspora_8php.html',1,'']]],
-  ['bbcode_2ephp',['bbcode.php',['../bbcode_8php.html',1,'']]],
-  ['block_2ephp',['block.php',['../block_8php.html',1,'']]],
-  ['blocks_2ephp',['blocks.php',['../blocks_8php.html',1,'']]],
-  ['bookmarks_2ephp',['bookmarks.php',['../include_2bookmarks_8php.html',1,'']]],
-  ['bookmarks_2ephp',['bookmarks.php',['../mod_2bookmarks_8php.html',1,'']]],
-  ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]],
-  ['boxy_2ephp',['boxy.php',['../boxy_8php.html',1,'']]],
-  ['bs_2ddefault_2ephp',['BS-Default.php',['../BS-Default_8php.html',1,'']]]
-];