Merge branch 'master' into tres

Conflicts:
	include/zot.php

1 files changed, 5 insertions, 1 deletions

diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js
index 2a142c1b9..4116d10f2 100644
--- a/doc/html/search/all_70.js
+++ b/doc/html/search/all_70.js
@@ -113,6 +113,7 @@ var searchData=
   ['png_5fquality',['PNG_QUALITY',['../boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce',1,'boot.php']]],
   ['po2php_2ephp',['po2php.php',['../po2php_8php.html',1,'']]],
   ['po2php_5frun',['po2php_run',['../po2php_8php.html#a3b75e36f913198299e99559b175cd8b4',1,'po2php.php']]],
+  ['poco',['poco',['../socgraph_8php.html#a2225cdc3651a0bea089b16cbfb6ddaf1',1,'socgraph.php']]],
   ['poco_2ephp',['poco.php',['../poco_8php.html',1,'']]],
   ['poco_5finit',['poco_init',['../poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498',1,'poco.php']]],
   ['poco_5fload',['poco_load',['../socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6',1,'socgraph.php']]],
@@ -137,6 +138,8 @@ var searchData=
   ['post_5fpost',['post_post',['../post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75',1,'post.php']]],
   ['post_5fvar',['post_var',['../pubsubhubbub_8php.html#a2006060ce09105d08716154c06aecfcd',1,'pubsubhubbub.php']]],
   ['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]],
+  ['prate_2ephp',['prate.php',['../prate_8php.html',1,'']]],
+  ['prate_5fpost',['prate_post',['../prate_8php.html#af0e041483d1c6451ef5ce5f295e1dbfd',1,'prate.php']]],
   ['preg_5fcallback_5fhelp_5finclude',['preg_callback_help_include',['../help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4',1,'help.php']]],
   ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]],
   ['prep_2ephp',['prep.php',['../prep_8php.html',1,'']]],
@@ -153,8 +156,8 @@ var searchData=
   ['private_5fmessages_5ffetch_5fconversation',['private_messages_fetch_conversation',['../include_2message_8php.html#a5f8de9847e203329e317ac38dc646898',1,'message.php']]],
   ['private_5fmessages_5ffetch_5fmessage',['private_messages_fetch_message',['../include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091',1,'message.php']]],
   ['private_5fmessages_5flist',['private_messages_list',['../include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e',1,'message.php']]],
-  ['probe_2ephp',['probe.php',['../mod_2probe_8php.html',1,'']]],
   ['probe_2ephp',['probe.php',['../include_2probe_8php.html',1,'']]],
+  ['probe_2ephp',['probe.php',['../mod_2probe_8php.html',1,'']]],
   ['probe_5factivity_5fstream',['probe_activity_stream',['../include_2probe_8php.html#a2daa857942aceca01f956016dbbd139c',1,'probe.php']]],
   ['probe_5fcontent',['probe_content',['../mod_2probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99',1,'probe.php']]],
   ['probe_5fdfrn',['probe_dfrn',['../include_2probe_8php.html#a9b5eca1e01e52b3e65d64db0c92181e0',1,'probe.php']]],
@@ -170,6 +173,7 @@ var searchData=
   ['process_5flocation_5fdelivery',['process_location_delivery',['../zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988',1,'zot.php']]],
   ['process_5fmail_5fdelivery',['process_mail_delivery',['../zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc',1,'zot.php']]],
   ['process_5fprofile_5fdelivery',['process_profile_delivery',['../zot_8php.html#a9a57b40669351c9791126b925cb7ef3b',1,'zot.php']]],
+  ['process_5frating_5fdelivery',['process_rating_delivery',['../zot_8php.html#ab718f7ab0df9c4153037d1a3f2613181',1,'zot.php']]],
   ['profile_2ephp',['profile.php',['../profile_8php.html',1,'']]],
   ['profile_5factivity',['profile_activity',['../activities_8php.html#a80134e807719b3c54aba971958d2e132',1,'activities.php']]],
   ['profile_5fcontent',['profile_content',['../profile_8php.html#a3775cf6eef6587e5143133356a7b76c0',1,'profile.php']]],