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

diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js
deleted file mode 100644
index e0761d586..000000000
--- a/doc/html/search/functions_72.js
+++ /dev/null
@@ -1,87 +0,0 @@
-var searchData=
-[
-  ['random_5fprofile',['random_profile',['../Contact_8php.html#a7e3f5bef8ea1d2bf8434c9be36a2b713',1,'Contact.php']]],
-  ['random_5fstring',['random_string',['../text_8php.html#a9d6a5ee1290de7a8b483fe78585daade',1,'text.php']]],
-  ['randprof_5finit',['randprof_init',['../randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090',1,'randprof.php']]],
-  ['rate_5fcontent',['rate_content',['../rate_8php.html#a22fc66202522acb53fb3746fc21d80f2',1,'rate.php']]],
-  ['rate_5finit',['rate_init',['../rate_8php.html#a051f31f49e9decd6d701bc5ab8fb7771',1,'rate.php']]],
-  ['rate_5fpost',['rate_post',['../rate_8php.html#acae9f41835b07e3c977464030e8831fc',1,'rate.php']]],
-  ['ratenotif_5frun',['ratenotif_run',['../ratenotif_8php.html#a0dd7843f7f10ba9ea29bcbdff1cdbf37',1,'ratenotif.php']]],
-  ['ratings_5fcontent',['ratings_content',['../ratings_8php.html#a25f835d136b884354cf1fa4d897c857b',1,'ratings.php']]],
-  ['ratings_5finit',['ratings_init',['../ratings_8php.html#abcfe38319c4e66eb70a687ecc2966ac3',1,'ratings.php']]],
-  ['ratingsearch_5finit',['ratingsearch_init',['../ratingsearch_8php.html#aa609eb568ce273ef08e04a39ee532466',1,'ratingsearch.php']]],
-  ['rbmark_5fcontent',['rbmark_content',['../rbmark_8php.html#a43fec4960b50926251574762cc491f76',1,'rbmark.php']]],
-  ['rbmark_5fpost',['rbmark_post',['../rbmark_8php.html#ac5a66aa8599fa5dc702bae396d8d1f8c',1,'rbmark.php']]],
-  ['rconnect_5furl',['rconnect_url',['../Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91',1,'Contact.php']]],
-  ['rebuild_5ftheme_5ftable',['rebuild_theme_table',['../admin_8php.html#ae46311a3fefc21abc838a26e91789de6',1,'admin.php']]],
-  ['receive_5fpost',['receive_post',['../receive_8php.html#a03d8fa26e77844020ba5602deca7d494',1,'receive.php']]],
-  ['recursive_5factivity_5frecipients',['recursive_activity_recipients',['../include_2attach_8php.html#aabd15487fa0e5d2dc5c480f72d23b886',1,'attach.php']]],
-  ['red_5fescape_5fcodeblock',['red_escape_codeblock',['../items_8php.html#a49905ea75adfe8a2d110be344d18d6a6',1,'items.php']]],
-  ['red_5fescape_5fzrl_5fcallback',['red_escape_zrl_callback',['../items_8php.html#a83a349062945d585edb4b3c5d763ab6e',1,'items.php']]],
-  ['red_5fitem_5fnew',['red_item_new',['../include_2api_8php.html#aafa82b65a9f879a1a1197cfe8aaf3898',1,'api.php']]],
-  ['red_5funescape_5fcodeblock',['red_unescape_codeblock',['../items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a',1,'items.php']]],
-  ['red_5fzrl_5fcallback',['red_zrl_callback',['../items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b',1,'items.php']]],
-  ['red_5fzrlify_5fimg_5fcallback',['red_zrlify_img_callback',['../items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a',1,'items.php']]],
-  ['redbasic_5fform',['redbasic_form',['../view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793',1,'config.php']]],
-  ['redbasic_5finit',['redbasic_init',['../redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b',1,'theme.php']]],
-  ['redchannellist',['RedChannelList',['../reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66',1,'reddav.php']]],
-  ['redcollectiondata',['RedCollectionData',['../reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266',1,'reddav.php']]],
-  ['redfiledata',['RedFileData',['../reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088',1,'reddav.php']]],
-  ['reduce',['reduce',['../docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f',1,'docblox_errorchecker.php']]],
-  ['ref_5fsession_5fclose',['ref_session_close',['../session_8php.html#a5e1c616e02b863d5450317d101366bb7',1,'session.php']]],
-  ['ref_5fsession_5fdestroy',['ref_session_destroy',['../session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052',1,'session.php']]],
-  ['ref_5fsession_5fgc',['ref_session_gc',['../session_8php.html#ac95373f4966862a028033dd2f94d4da1',1,'session.php']]],
-  ['ref_5fsession_5fopen',['ref_session_open',['../session_8php.html#a26fa1042356d555023cbf15ddd4f8507',1,'session.php']]],
-  ['ref_5fsession_5fread',['ref_session_read',['../session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e',1,'session.php']]],
-  ['ref_5fsession_5fwrite',['ref_session_write',['../session_8php.html#ac4461c1984543d3553e73dba2771568f',1,'session.php']]],
-  ['refimport_5fcontent',['refimport_content',['../refimport_8php.html#ad97ebb5feda0230a4834e0b3637a0d29',1,'refimport.php']]],
-  ['reflect_5farticle_5fcallback',['reflect_article_callback',['../refimport_8php.html#a53434bc19e6264db89e18d92ddc09860',1,'refimport.php']]],
-  ['reflect_5fcomment_5fstore',['reflect_comment_store',['../refimport_8php.html#a01a29630fa5e1ce6cd5e1fd75280747c',1,'refimport.php']]],
-  ['reflect_5ffind_5fuser',['reflect_find_user',['../refimport_8php.html#aa98de7d112e3a5b4b6956f108d04a41d',1,'refimport.php']]],
-  ['reflect_5fget_5fchannel',['reflect_get_channel',['../refimport_8php.html#a6c3e0475fde9fe72ff2492a5e3e5259c',1,'refimport.php']]],
-  ['reflect_5fphoto_5fcallback',['reflect_photo_callback',['../refimport_8php.html#ae9c56f779d1e0ac7bcb2a460129e7ae5',1,'refimport.php']]],
-  ['regdir_5finit',['regdir_init',['../regdir_8php.html#a6e703a4e66d2370c48500262cc0b56dd',1,'regdir.php']]],
-  ['register_5fcontent',['register_content',['../register_8php.html#a0e91f57f111407ea8d3223a05022bb2a',1,'register.php']]],
-  ['register_5fhook',['register_hook',['../plugin_8php.html#a425472c5f3afc137268b2ad45652b209',1,'plugin.php']]],
-  ['register_5finit',['register_init',['../register_8php.html#ae20c0cd40f738d6295de58b9202c83d5',1,'register.php']]],
-  ['register_5fpage_5ftemplate',['register_page_template',['../comanche_8php.html#a3d11417d2d846dbe72638a556529ff8f',1,'comanche.php']]],
-  ['register_5fpost',['register_post',['../register_8php.html#a51731dcc1917c58a790eb1c0f6132271',1,'register.php']]],
-  ['register_5ftemplate_5fengine',['register_template_engine',['../classApp.html#abf46a653d8499e7c253cc1be894a6d83',1,'App']]],
-  ['regmod_5fcontent',['regmod_content',['../regmod_8php.html#a7953df4e32e63946565e90cdd5d50409',1,'regmod.php']]],
-  ['regver_5fcontent',['regver_content',['../regver_8php.html#ad2c5f644fd1b099abd7c715b7df6f50f',1,'regver.php']]],
-  ['relative_5fdate',['relative_date',['../datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82',1,'datetime.php']]],
-  ['reload_5fplugins',['reload_plugins',['../plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025',1,'plugin.php']]],
-  ['reltoabs',['reltoabs',['../text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2',1,'text.php']]],
-  ['remote_5fchannel',['remote_channel',['../boot_8php.html#ad9f1a90205081844e1e9c4b2ffd95458',1,'boot.php']]],
-  ['remote_5fonline_5fstatus',['remote_online_status',['../identity_8php.html#a47d6f53216f23a3484061793bef29854',1,'identity.php']]],
-  ['remote_5fuser',['remote_user',['../boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209',1,'boot.php']]],
-  ['remove_5fall_5fxchan_5fresources',['remove_all_xchan_resources',['../Contact_8php.html#acc12cda999c88c4d6185cca967c15125',1,'Contact.php']]],
-  ['remove_5fchild',['remove_child',['../classItem.html#a2ce70ef63f9f4d86a09c351678806925',1,'Item']]],
-  ['remove_5fcommunity_5ftag',['remove_community_tag',['../zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10',1,'zot.php']]],
-  ['remove_5fobsolete_5fhublocs',['remove_obsolete_hublocs',['../hubloc_8php.html#a84c79b7be352f62d12fe4fa2c80fc6ea',1,'hubloc.php']]],
-  ['remove_5fparent',['remove_parent',['../classItem.html#aa452b5bcd8dea12119b09212c615cb41',1,'Item']]],
-  ['remove_5fqueue_5fitem',['remove_queue_item',['../queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24',1,'queue_fn.php']]],
-  ['removeaccount_5fcontent',['removeaccount_content',['../removeaccount_8php.html#a516e7380b9e5796054aa8245f3509695',1,'removeaccount.php']]],
-  ['removeaccount_5fpost',['removeaccount_post',['../removeaccount_8php.html#a26a3325292e932c59793430ab737126a',1,'removeaccount.php']]],
-  ['removeme_5fcontent',['removeme_content',['../removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c',1,'removeme.php']]],
-  ['removeme_5fpost',['removeme_post',['../removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88',1,'removeme.php']]],
-  ['render_5flocation_5fdefault',['render_location_default',['../conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2',1,'conversation.php']]],
-  ['replace',['replace',['../classTemplate.html#a285b5b2007dbbf733476273df3fed4ef',1,'Template']]],
-  ['replace_5fmacros',['replace_macros',['../interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243',1,'ITemplateEngine\replace_macros()'],['../classFriendicaSmartyEngine.html#ad62f1181d2f02b54b46731ad2bd46db2',1,'FriendicaSmartyEngine\replace_macros()'],['../classTemplate.html#a07737733f6949bdedea1e3d301b2ab7b',1,'Template\replace_macros()'],['../text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09',1,'replace_macros(): text.php']]],
-  ['requestdata',['requestdata',['../include_2api_8php.html#a43c47de8565cc00c3369cb35c19cc75e',1,'api.php']]],
-  ['retain_5fitem',['retain_item',['../items_8php.html#af6237605c60d69abdd959ddbbee3420c',1,'items.php']]],
-  ['return_5fbytes',['return_bytes',['../text_8php.html#ae2126da85966da0e79c6bcbac63b0bda',1,'text.php']]],
-  ['rmagic_5fcontent',['rmagic_content',['../rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef',1,'rmagic.php']]],
-  ['rmagic_5finit',['rmagic_init',['../rmagic_8php.html#a95455edd43f1bff39446a57388cdde16',1,'rmagic.php']]],
-  ['rmagic_5fpost',['rmagic_post',['../rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f',1,'rmagic.php']]],
-  ['rotate',['rotate',['../classphoto__driver.html#a2f2b6337cf9aa0688d10b422123f0eec',1,'photo_driver\rotate()'],['../classphoto__gd.html#a77f87730b11093b76980c541159df37d',1,'photo_gd\rotate()'],['../classphoto__imagick.html#a9df5738a4a18e76dd304c440e96f045f',1,'photo_imagick\rotate()']]],
-  ['rpost_5fcallback',['rpost_callback',['../bbcode_8php.html#a5165a5221a52cf1bc1d7812ebd2069c7',1,'bbcode.php']]],
-  ['rpost_5fcontent',['rpost_content',['../rpost_8php.html#a8190354d789000806d9879aea276728f',1,'rpost.php']]],
-  ['rrmdir',['rrmdir',['../Contact_8php.html#ab5895b75a3b2abdddf1cb351a8c6b58b',1,'Contact.php']]],
-  ['rsa_5fsign',['rsa_sign',['../crypto_8php.html#a920e5f222d0020f47556033d8b2b6552',1,'crypto.php']]],
-  ['rsa_5fverify',['rsa_verify',['../crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96',1,'crypto.php']]],
-  ['rsatopem',['rsatopem',['../crypto_8php.html#a7f7e650aaeaa3832580a73eb00966b26',1,'crypto.php']]],
-  ['rsd_5fxml_5fcontent',['rsd_xml_content',['../rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82',1,'rsd_xml.php']]],
-  ['run',['run',['../classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c',1,'RedMatrix::Import::Import']]],
-  ['runs',['runs',['../docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec',1,'docblox_errorchecker.php']]]
-];