Thanks for this message. I completely forgot about the Master. I merged my fork with the master and pushed the changes now.<br><br><div class="gmail_quote">2010/7/29 Herman van Rink <span dir="ltr">&lt;<a href="mailto:rink@initfour.nl">rink@initfour.nl</a>&gt;</span><br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">Martynas,<br>
<br>
I tried to merge the current master into your branch, just for the fun<br>
of it. Only server_status.php had a merge conflict, just the added<br>
require_once &#39;./libraries/chart.lib.php&#39;; and it&#39;s comment block which<br>
interfered with another change.<br>
So maybe it&#39;s a good idea to merge master every now and then.<br>
I&#39;d hate to have a problem later when we try to merge your tree back<br>
into master.<br>
<font color="#888888"><br>
--<br>
<br>
Met vriendelijke groet / Regards,<br>
<br>
Herman van Rink<br>
Initfour websolutions<br>
<br>
<br>
</font></blockquote></div><br>