<hr>

<h4>You can merge this Pull Request by running</h4>
<pre>  git pull https://github.com/opentechinstitute/luci-commotion issue_30</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/opentechinstitute/luci-commotion/pull/54'>https://github.com/opentechinstitute/luci-commotion/pull/54</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>removed commotion helpers function for replacement with new helpers module</li>
  <li>pointed old log references to log function in new modularized commotion helpers package</li>
  <li>fixed some merge issues</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>D</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion/pull/54/files#diff-0">luasrc/commotion_helpers.lua</a>
    (203)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion/pull/54/files#diff-1">luasrc/controller/commotion/meshprofile.lua</a>
    (37)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion/pull/54/files#diff-2">luasrc/controller/commotion/serval_keyring.lua</a>
    (30)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/opentechinstitute/luci-commotion/pull/54.patch'>https://github.com/opentechinstitute/luci-commotion/pull/54.patch</a></li>
  <li><a href='https://github.com/opentechinstitute/luci-commotion/pull/54.diff'>https://github.com/opentechinstitute/luci-commotion/pull/54.diff</a></li>
</ul>