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

diff --git a/doc/html/search/files_6d.js b/doc/html/search/files_6d.js
deleted file mode 100644
index 744784a0b..000000000
--- a/doc/html/search/files_6d.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var searchData=
-[
-  ['magic_2ephp',['magic.php',['../magic_8php.html',1,'']]],
-  ['mail_2ephp',['mail.php',['../mail_8php.html',1,'']]],
-  ['manage_2ephp',['manage.php',['../manage_8php.html',1,'']]],
-  ['match_2ephp',['match.php',['../match_8php.html',1,'']]],
-  ['menu_2ephp',['menu.php',['../mod_2menu_8php.html',1,'']]],
-  ['menu_2ephp',['menu.php',['../include_2menu_8php.html',1,'']]],
-  ['message_2ephp',['message.php',['../include_2message_8php.html',1,'']]],
-  ['message_2ephp',['message.php',['../mod_2message_8php.html',1,'']]],
-  ['minimal_2ephp',['minimal.php',['../minimal_8php.html',1,'']]],
-  ['minimalisticdarkness_2ephp',['minimalisticdarkness.php',['../minimalisticdarkness_8php.html',1,'']]],
-  ['mitem_2ephp',['mitem.php',['../mitem_8php.html',1,'']]],
-  ['mod_5fchanview_2ephp',['mod_chanview.php',['../mod__chanview_8php.html',1,'']]],
-  ['mod_5fimport_2ephp',['mod_import.php',['../mod__import_8php.html',1,'']]],
-  ['mood_2ephp',['mood.php',['../mood_8php.html',1,'']]],
-  ['msearch_2ephp',['msearch.php',['../msearch_8php.html',1,'']]]
-];