[vz-dev] [volkszaehler/volkszaehler.org] cbe0f4: Merge branch 'master' of https://github.com/volksz...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/volkszaehler.org
  Commit: cbe0f48a017c0b4a8c84788af5b6cf264521cbec
      https://github.com/volkszaehler/volkszaehler.org/commit/cbe0f48a017c0b4a8c84788af5b6cf264521cbec
  Author: andig <cpuidle at gmx.de>
  Date:   2015-02-28 (Sat, 28 Feb 2015)

  Changed paths:
    M .travis.yml
    R CHANGELOG
    R README
    A README.md
    M htdocs/frontend/javascripts/options.js
    A misc/docs/screenshot.png
    A misc/tools/jsonclient
    M misc/tools/vzclient
    A test/bin/apc.ini
    A test/bin/install-apcu.sh

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/volkszaehler/volkszaehler.org


  Commit: c1a8cd3f65e2b67bb9e09f1bb299e6b493b2193a
      https://github.com/volkszaehler/volkszaehler.org/commit/c1a8cd3f65e2b67bb9e09f1bb299e6b493b2193a
  Author: andig <cpuidle at gmx.de>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M misc/controller/README
    R misc/controller/current_cost/README
    R misc/controller/current_cost/create-rrd.sh
    R misc/controller/current_cost/crontab.example
    R misc/controller/current_cost/doall.sh
    R misc/controller/current_cost/fetchdata.pl
    R misc/controller/current_cost/makegraphs.sh

  Log Message:
  -----------
  Update misc folder


  Commit: f54ce9673b9c0cd07e66cd1a028adf5cdfa6f2d6
      https://github.com/volkszaehler/volkszaehler.org/commit/f54ce9673b9c0cd07e66cd1a028adf5cdfa6f2d6
  Author: andig <cpuidle at gmx.de>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M misc/controller/README
    R misc/controller/current_cost/README
    R misc/controller/current_cost/create-rrd.sh
    R misc/controller/current_cost/crontab.example
    R misc/controller/current_cost/doall.sh
    R misc/controller/current_cost/fetchdata.pl
    R misc/controller/current_cost/makegraphs.sh

  Log Message:
  -----------
  Merge pull request #260 from andig/misc

Cleanup misc contributions


Compare: https://github.com/volkszaehler/volkszaehler.org/compare/cc9a5a8de096...f54ce9673b9c