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

diff --git a/doc/html/search/files_6e.js b/doc/html/search/files_6e.js
deleted file mode 100644
index d60286b45..000000000
--- a/doc/html/search/files_6e.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var searchData=
-[
-  ['nav_2ephp',['nav.php',['../nav_8php.html',1,'']]],
-  ['netgrowth_2ephp',['netgrowth.php',['../netgrowth_8php.html',1,'']]],
-  ['network_2ephp',['network.php',['../mod_2network_8php.html',1,'']]],
-  ['network_2ephp',['network.php',['../include_2network_8php.html',1,'']]],
-  ['new_5fchannel_2ephp',['new_channel.php',['../new__channel_8php.html',1,'']]],
-  ['none_2ephp',['none.php',['../none_8php.html',1,'']]],
-  ['notes_2ephp',['notes.php',['../notes_8php.html',1,'']]],
-  ['notifications_2ephp',['notifications.php',['../notifications_8php.html',1,'']]],
-  ['notifier_2ephp',['notifier.php',['../notifier_8php.html',1,'']]],
-  ['notify_2ephp',['notify.php',['../include_2notify_8php.html',1,'']]],
-  ['notify_2ephp',['notify.php',['../mod_2notify_8php.html',1,'']]],
-  ['notred_2ephp',['notred.php',['../notred_8php.html',1,'']]]
-];