Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Mon, 8 Sep 2014 15:11:56 +0000 (17:11 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 8 Sep 2014 15:11:56 +0000 (17:11 +0200)
commit67411e0794cfcab38e322b2ebbe2e5207cbdd86a
tree141106b61e6d27ad86bc54f201feeef8fcb48e62
parentc0a9b7b38edf881e134f602b62990518a79bf191
parentbe0a3a6eeb3655d5559abe768c4027889d1ae979
Merge remote-tracking branch 'github/master'