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

diff --git a/doc/html/search/files_70.js b/doc/html/search/files_70.js
deleted file mode 100644
index 9b9d3ac87..000000000
--- a/doc/html/search/files_70.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var searchData=
-[
-  ['p_2ephp',['p.php',['../p_8php.html',1,'']]],
-  ['page_2ephp',['page.php',['../page_8php.html',1,'']]],
-  ['page_5fwidgets_2ephp',['page_widgets.php',['../page__widgets_8php.html',1,'']]],
-  ['parse_5furl_2ephp',['parse_url.php',['../parse__url_8php.html',1,'']]],
-  ['passion_2ephp',['passion.php',['../passion_8php.html',1,'']]],
-  ['passionwide_2ephp',['passionwide.php',['../passionwide_8php.html',1,'']]],
-  ['pdledit_2ephp',['pdledit.php',['../pdledit_8php.html',1,'']]],
-  ['permissions_2ephp',['permissions.php',['../permissions_8php.html',1,'']]],
-  ['photo_2ephp',['photo.php',['../photo_8php.html',1,'']]],
-  ['photo_5fdriver_2ephp',['photo_driver.php',['../photo__driver_8php.html',1,'']]],
-  ['photo_5fgd_2ephp',['photo_gd.php',['../photo__gd_8php.html',1,'']]],
-  ['photo_5fimagick_2ephp',['photo_imagick.php',['../photo__imagick_8php.html',1,'']]],
-  ['photos_2ephp',['photos.php',['../include_2photos_8php.html',1,'']]],
-  ['photos_2ephp',['photos.php',['../mod_2photos_8php.html',1,'']]],
-  ['php_2ephp',['php.php',['../php_8php.html',1,'']]],
-  ['php2po_2ephp',['php2po.php',['../php2po_8php.html',1,'']]],
-  ['pine_2ephp',['pine.php',['../pine_8php.html',1,'']]],
-  ['ping_2ephp',['ping.php',['../ping_8php.html',1,'']]],
-  ['plugin_2ephp',['plugin.php',['../plugin_8php.html',1,'']]],
-  ['po2php_2ephp',['po2php.php',['../po2php_8php.html',1,'']]],
-  ['poco_2ephp',['poco.php',['../poco_8php.html',1,'']]],
-  ['poke_2ephp',['poke.php',['../poke_8php.html',1,'']]],
-  ['poll_2ephp',['poll.php',['../poll_8php.html',1,'']]],
-  ['poller_2ephp',['poller.php',['../poller_8php.html',1,'']]],
-  ['post_2ephp',['post.php',['../post_8php.html',1,'']]],
-  ['prate_2ephp',['prate.php',['../prate_8php.html',1,'']]],
-  ['pretheme_2ephp',['pretheme.php',['../pretheme_8php.html',1,'']]],
-  ['probe_2ephp',['probe.php',['../include_2probe_8php.html',1,'']]],
-  ['probe_2ephp',['probe.php',['../mod_2probe_8php.html',1,'']]],
-  ['profile_2ephp',['profile.php',['../profile_8php.html',1,'']]],
-  ['profile_5fphoto_2ephp',['profile_photo.php',['../profile__photo_8php.html',1,'']]],
-  ['profile_5fselectors_2ephp',['profile_selectors.php',['../profile__selectors_8php.html',1,'']]],
-  ['profiles_2ephp',['profiles.php',['../profiles_8php.html',1,'']]],
-  ['profperm_2ephp',['profperm.php',['../profperm_8php.html',1,'']]],
-  ['protodriver_2ephp',['ProtoDriver.php',['../ProtoDriver_8php.html',1,'']]],
-  ['pubsites_2ephp',['pubsites.php',['../pubsites_8php.html',1,'']]],
-  ['pubsub_2ephp',['pubsub.php',['../pubsub_8php.html',1,'']]],
-  ['pubsubhubbub_2ephp',['pubsubhubbub.php',['../pubsubhubbub_8php.html',1,'']]]
-];