tree acd3a8e2edb4d1ba5fc6c7732c407359a0e31d85
parent 7c798830dcc14ec13d17dbbae689a947f8f537cb
parent d1865ffba00bd83f9ef26054d5dceb0d5fea64a0
author Jakub Pavlik <pavlk.jakub@gmail.com> 1475868575 +0200
committer GitHub <noreply@github.com> 1475868575 +0200

Merge pull request #7 from tcpcloud/collectd_update

Global collectd update