Merge branch 'master' into tres

Conflicts:
	mod/events.php
	view/css/mod_events.css

1 files changed, 18 insertions, 0 deletions

diff --git a/doc/html/prate_8php.html b/doc/html/prate_8php.html
index 926591812..b03402ff5 100644
--- a/doc/html/prate_8php.html
+++ b/doc/html/prate_8php.html
@@ -112,10 +112,28 @@ $(document).ready(function(){initNavTree('prate_8php.html','');});
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
 Functions</h2></td></tr>
+<tr class="memitem:a39181c85d6c3f1567aba992c1ad90a4d"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="prate_8php.html#a39181c85d6c3f1567aba992c1ad90a4d">prate_init</a> (&amp;$a)</td></tr>
+<tr class="separator:a39181c85d6c3f1567aba992c1ad90a4d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:af0e041483d1c6451ef5ce5f295e1dbfd"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="prate_8php.html#af0e041483d1c6451ef5ce5f295e1dbfd">prate_post</a> (&amp;$a)</td></tr>
 <tr class="separator:af0e041483d1c6451ef5ce5f295e1dbfd"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <h2 class="groupheader">Function Documentation</h2>
+<a class="anchor" id="a39181c85d6c3f1567aba992c1ad90a4d"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">prate_init </td>
+          <td>(</td>
+          <td class="paramtype">&amp;&#160;</td>
+          <td class="paramname"><em>$a</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
 <a class="anchor" id="af0e041483d1c6451ef5ce5f295e1dbfd"></a>
 <div class="memitem">
 <div class="memproto">