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

diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js
deleted file mode 100644
index 85fe78603..000000000
--- a/doc/html/search/functions_64.js
+++ /dev/null
@@ -1,98 +0,0 @@
-var searchData=
-[
-  ['datesel',['datesel',['../datetime_8php.html#a77bb385ae8a9e7ca663309c102c0d766',1,'datetime.php']]],
-  ['datetime_5fconvert',['datetime_convert',['../datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226',1,'datetime.php']]],
-  ['datetimesel',['datetimesel',['../datetime_8php.html#a6732f99377eb2b57e643e3b7b3ba17b7',1,'datetime.php']]],
-  ['dav_5finit',['dav_init',['../dav_8php.html#addd46b5ec6cd6c23e065634462b7f040',1,'dav.php']]],
-  ['day_5ftranslate',['day_translate',['../text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63',1,'text.php']]],
-  ['db_5fconcat',['db_concat',['../dba__driver_8php.html#a7c1b98a710ead27382c958ad3216c4ee',1,'dba_driver.php']]],
-  ['db_5fgetfunc',['db_getfunc',['../dba__driver_8php.html#a2994daa03b1c23229a27e39bcab75e67',1,'dba_driver.php']]],
-  ['db_5foptimizetable',['db_optimizetable',['../dba__driver_8php.html#a75098bf1d59ea57f7ebae657a369137e',1,'dba_driver.php']]],
-  ['db_5fquoteinterval',['db_quoteinterval',['../dba__driver_8php.html#acec84a8fb75d78daf657cbe5df74e25a',1,'dba_driver.php']]],
-  ['db_5futcnow',['db_utcnow',['../dba__driver_8php.html#a30e9a643be804e905f5614a3279d2645',1,'dba_driver.php']]],
-  ['dba_5ffactory',['dba_factory',['../dba__driver_8php.html#a5df8499634c47b30191f34069d7b98c0',1,'dba_driver.php']]],
-  ['dba_5ftimer',['dba_timer',['../boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4',1,'boot.php']]],
-  ['dbesc',['dbesc',['../dba__driver_8php.html#ab222aa1dbf9ea93b320f82028739127e',1,'dba_driver.php']]],
-  ['dbesc_5farray',['dbesc_array',['../dba__driver_8php.html#a65b83462bd26968106aebd43f16540e4',1,'dba_driver.php']]],
-  ['dbesc_5farray_5fcb',['dbesc_array_cb',['../dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930',1,'dba_driver.php']]],
-  ['dbesc_5fidentifier',['dbesc_identifier',['../dba__driver_8php.html#aa051799567690a124a3b865bf902f58a',1,'dba_driver.php']]],
-  ['dbescbin',['dbescbin',['../dba__driver_8php.html#a2a38996670c2936b5769270c49c57593',1,'dba_driver.php']]],
-  ['dbescdate',['dbescdate',['../dba__driver_8php.html#a2c8a72ec73f39b17a167c90737693f78',1,'dba_driver.php']]],
-  ['dbg',['dbg',['../classdba__driver.html#adcc1f8955120fec0708bce39202d0422',1,'dba_driver\dbg()'],['../dba__driver_8php.html#aa6607893d8f60ade9122bcfbd1a53ffb',1,'dbg(): dba_driver.php']]],
-  ['dbq',['dbq',['../dba__driver_8php.html#aa377074e70981e8c4e82ca0accd068ee',1,'dba_driver.php']]],
-  ['dbunescbin',['dbunescbin',['../dba__driver_8php.html#afaaa1a7eff9c1b65b3b8c464ae37640e',1,'dba_driver.php']]],
-  ['decode_5ftags',['decode_tags',['../items_8php.html#a56b2a4abcadfac71175cd50555528cc3',1,'items.php']]],
-  ['del_5fconfig',['del_config',['../include_2config_8php.html#a549910227348003efc3c05c9105c42da',1,'config.php']]],
-  ['del_5fpconfig',['del_pconfig',['../include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941',1,'config.php']]],
-  ['del_5fxconfig',['del_xconfig',['../include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72',1,'config.php']]],
-  ['delegate_5fcontent',['delegate_content',['../delegate_8php.html#a943eea8996ef348eb845c498f9f354dd',1,'delegate.php']]],
-  ['delete',['delete',['../classRedMatrix_1_1RedDAV_1_1RedFile.html#ab7ab7ba81fab28eb02382cfdfd80ecfe',1,'RedMatrix::RedDAV::RedFile']]],
-  ['delete_5fimported_5fitem',['delete_imported_item',['../zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72',1,'zot.php']]],
-  ['delete_5fitem_5flowlevel',['delete_item_lowlevel',['../items_8php.html#a6b448675b71b00ee5ef798468dde4d22',1,'items.php']]],
-  ['deletenode',['deletenode',['../html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2',1,'html2bbcode.php']]],
-  ['deliver',['deliver',['../classProtoDriver.html#a85e9063f6d0c304410cd246f7900ea1b',1,'ProtoDriver\deliver()'],['../classZotDriver.html#a876e3e0e4cad83c0b58c8696b344be6f',1,'ZotDriver\deliver()']]],
-  ['deliver_5fprivate',['deliver_private',['../classProtoDriver.html#ae5b44739f84c10d00a9b65adf3785181',1,'ProtoDriver\deliver_private()'],['../classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6',1,'ZotDriver\deliver_private()']]],
-  ['deliver_5frun',['deliver_run',['../deliver_8php.html#a397afcb9afecf0c1816b0951189dd346',1,'deliver.php']]],
-  ['dertopem',['DerToPem',['../crypto_8php.html#a630e1574554f34e7c38511585d9e71a2',1,'crypto.php']]],
-  ['dertorsa',['DerToRsa',['../crypto_8php.html#ae5af17db1cb5d7c91d486e1264079839',1,'crypto.php']]],
-  ['design_5ftools',['design_tools',['../text_8php.html#a87a3cefc603302c78982f1d8e1245265',1,'text.php']]],
-  ['destroy',['destroy',['../classphoto__driver.html#ae1a9edaf846983780dc65ea77d99e813',1,'photo_driver\destroy()'],['../classphoto__gd.html#a724703ecf71b1f1d04a80e86c76db6b1',1,'photo_gd\destroy()'],['../classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207',1,'photo_imagick\destroy()']]],
-  ['detect_5flanguage',['detect_language',['../language_8php.html#a632da17c7ac0d2dc1a00a4706870194b',1,'language.php']]],
-  ['diaspora2bb',['diaspora2bb',['../bb2diaspora_8php.html#ac9061ee10fcfcdac69566b649614e625',1,'bb2diaspora.php']]],
-  ['diaspora_5fasphoto',['diaspora_asphoto',['../diaspora_8php.html#a006731620a5242d410358b32678e48e3',1,'diaspora.php']]],
-  ['diaspora_5fcomment',['diaspora_comment',['../diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829',1,'diaspora.php']]],
-  ['diaspora_5fconversation',['diaspora_conversation',['../diaspora_8php.html#adef30b6fac948baedcc7194d5d155b5f',1,'diaspora.php']]],
-  ['diaspora_5fdecode',['diaspora_decode',['../diaspora_8php.html#a849754ec369e1a60fadae5c14584ca36',1,'diaspora.php']]],
-  ['diaspora_5fdispatch',['diaspora_dispatch',['../diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66',1,'diaspora.php']]],
-  ['diaspora_5fdispatch_5fpublic',['diaspora_dispatch_public',['../diaspora_8php.html#ab99505944728d46585b8312989de533d',1,'diaspora.php']]],
-  ['diaspora_5fget_5fcontact_5fby_5fhandle',['diaspora_get_contact_by_handle',['../diaspora_8php.html#aa8e551a53fcce34be3942d0c3e20d1f4',1,'diaspora.php']]],
-  ['diaspora_5fhandle_5ffrom_5fcontact',['diaspora_handle_from_contact',['../diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff',1,'diaspora.php']]],
-  ['diaspora_5fis_5fblacklisted',['diaspora_is_blacklisted',['../diaspora_8php.html#a858f70153c384f8778082cf7843a19da',1,'diaspora.php']]],
-  ['diaspora_5fis_5freshare',['diaspora_is_reshare',['../diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690',1,'diaspora.php']]],
-  ['diaspora_5flike',['diaspora_like',['../diaspora_8php.html#a5d57518545baa31cf8a85a937a267681',1,'diaspora.php']]],
-  ['diaspora_5fmention_5fcallback',['diaspora_mention_callback',['../bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b',1,'bb2diaspora.php']]],
-  ['diaspora_5fmessage',['diaspora_message',['../diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46',1,'diaspora.php']]],
-  ['diaspora_5fmsg_5fbuild',['diaspora_msg_build',['../diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b',1,'diaspora.php']]],
-  ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]],
-  ['diaspora_5fphoto',['diaspora_photo',['../diaspora_8php.html#a72b2887e8be2e51d0114c16499e6ed4c',1,'diaspora.php']]],
-  ['diaspora_5fpost',['diaspora_post',['../diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31',1,'diaspora.php']]],
-  ['diaspora_5fprocess_5foutbound',['diaspora_process_outbound',['../diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605',1,'diaspora.php']]],
-  ['diaspora_5fprofile',['diaspora_profile',['../diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f',1,'diaspora.php']]],
-  ['diaspora_5fpubmsg_5fbuild',['diaspora_pubmsg_build',['../diaspora_8php.html#a586d5a3ba92d35cee14f879f290072aa',1,'diaspora.php']]],
-  ['diaspora_5frequest',['diaspora_request',['../diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598',1,'diaspora.php']]],
-  ['diaspora_5freshare',['diaspora_reshare',['../diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007',1,'diaspora.php']]],
-  ['diaspora_5fretraction',['diaspora_retraction',['../diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9',1,'diaspora.php']]],
-  ['diaspora_5fsend_5ffollowup',['diaspora_send_followup',['../diaspora_8php.html#af4698b165766f83d89ec1ea964bc92cc',1,'diaspora.php']]],
-  ['diaspora_5fsend_5fimages',['diaspora_send_images',['../diaspora_8php.html#ae6f52efd81fe515cd9912bc8293abf5b',1,'diaspora.php']]],
-  ['diaspora_5fsend_5fmail',['diaspora_send_mail',['../diaspora_8php.html#aeb2bb78f620dbf51d9335e6eb7444f2c',1,'diaspora.php']]],
-  ['diaspora_5fsend_5frelay',['diaspora_send_relay',['../diaspora_8php.html#a0b3628a5e53332c3d3196b689fe2b94d',1,'diaspora.php']]],
-  ['diaspora_5fsend_5fretraction',['diaspora_send_retraction',['../diaspora_8php.html#a1704748aa2384c73e43f10e71defd31a',1,'diaspora.php']]],
-  ['diaspora_5fsend_5fstatus',['diaspora_send_status',['../diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668',1,'diaspora.php']]],
-  ['diaspora_5fshare',['diaspora_share',['../diaspora_8php.html#a69f250b078a46e405647428ec3399a16',1,'diaspora.php']]],
-  ['diaspora_5fsigned_5fretraction',['diaspora_signed_retraction',['../diaspora_8php.html#aa34d2748bb97e9e193cacd572f335055',1,'diaspora.php']]],
-  ['diaspora_5ftransmit',['diaspora_transmit',['../diaspora_8php.html#aa704d6aa2ac77be345c0f501168e6e56',1,'diaspora.php']]],
-  ['diaspora_5ful',['diaspora_ul',['../bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc',1,'bb2diaspora.php']]],
-  ['diaspora_5funshare',['diaspora_unshare',['../diaspora_8php.html#ab736d6f32b5de31c97cb579fc730e200',1,'diaspora.php']]],
-  ['dir_5fflag_5fbuild',['dir_flag_build',['../dirsearch_8php.html#ab6d5fefa98da249a994b910434a669c2',1,'dirsearch.php']]],
-  ['dir_5fparse_5fquery',['dir_parse_query',['../dirsearch_8php.html#a7d4cd9890d5ed23c3efc58e2a778a305',1,'dirsearch.php']]],
-  ['dir_5fquery_5fbuild',['dir_query_build',['../dirsearch_8php.html#a52bcac49b0e35cc8c6b70066143c2ee2',1,'dirsearch.php']]],
-  ['dir_5fsafe_5fmode',['dir_safe_mode',['../dir__fns_8php.html#acf621621e929d49441da30aad76a58cf',1,'dir_fns.php']]],
-  ['dir_5fsort_5flinks',['dir_sort_links',['../dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774',1,'dir_fns.php']]],
-  ['dir_5ftagadelic',['dir_tagadelic',['../taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332',1,'taxonomy.php']]],
-  ['dir_5ftagblock',['dir_tagblock',['../taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1',1,'taxonomy.php']]],
-  ['directory_5fcontent',['directory_content',['../mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44',1,'directory.php']]],
-  ['directory_5finit',['directory_init',['../mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf',1,'directory.php']]],
-  ['directory_5frun',['directory_run',['../include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0',1,'directory.php']]],
-  ['dirsearch_5fcontent',['dirsearch_content',['../dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c',1,'dirsearch.php']]],
-  ['dirsearch_5finit',['dirsearch_init',['../dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752',1,'dirsearch.php']]],
-  ['discover',['discover',['../classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337',1,'ProtoDriver\discover()'],['../classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514',1,'ZotDriver\discover()']]],
-  ['discover_5fby_5furl',['discover_by_url',['../include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48',1,'network.php']]],
-  ['discover_5fby_5fwebbie',['discover_by_webbie',['../include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe',1,'network.php']]],
-  ['display_5fcontent',['display_content',['../display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0',1,'display.php']]],
-  ['dlogger',['dlogger',['../text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c',1,'text.php']]],
-  ['dob',['dob',['../datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8',1,'datetime.php']]],
-  ['doscaleimage',['doScaleImage',['../classphoto__driver.html#ae18716018afcf362c7c24586b53e9e2f',1,'photo_driver\doScaleImage()'],['../classphoto__gd.html#a2f2e5900e6d8b1667892ac631b1d4754',1,'photo_gd\doScaleImage()'],['../classphoto__imagick.html#a3047c68bb4de7f66c2893fe451db2b66',1,'photo_imagick\doScaleImage()']]],
-  ['downgrade_5faccounts',['downgrade_accounts',['../account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9',1,'account.php']]],
-  ['drop_5fitem',['drop_item',['../items_8php.html#ad65e3d4d8c537e560286b735a285e33e',1,'items.php']]],
-  ['drop_5fitems',['drop_items',['../items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55',1,'items.php']]]
-];