[Commotion-admin] [luci-commotion] Move fixes from 0.1 branch up to master. (#15)

[Josh King]

There are a number of fixes that were pushed directly into 0.1 before the best practices doc was established. This will merge these 5 additional fixes into the master branch as well in preparation for a new release branch.
You can merge this Pull Request by running:

  git pull https://github.com/opentechinstitute/luci-commotion 0.1

Or you can view, comment on it, or merge it online at:

  https://github.com/opentechinstitute/luci-commotion/pull/15

-- Commit Summary --

  * Remove unnecessary lines in proto_commotion.lua
  * Update license header on proto_commotion.lua.
  * Merge pull request #9 from opentechinstitute/proto-cleanup
  * added dhcp timeout form field to meshconfig cbi page
  * Merge pull request #10 from opentechinstitute/dhcp-timeout

-- File Changes --

    M luasrc/model/cbi/commotion/meshconfig.lua (8)
    M luasrc/model/network/proto_commotion.lua (42)

-- Patch Links --

https://github.com/opentechinstitute/luci-commotion/pull/15.patch
https://github.com/opentechinstitute/luci-commotion/pull/15.diff

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20130827/cd8705f1/attachment-0001.html>