Merge remote-tracking branch 'github/pr/1097'
authorFlorian Forster <octo@collectd.org>
Thu, 25 Jun 2015 20:37:20 +0000 (22:37 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 25 Jun 2015 20:37:20 +0000 (22:37 +0200)
commit88f22ff8b4c69eb38b6aaab30df212df1871d4ec
treebc09a4f0ff599f75c6b57f893fc7cf491f095c28
parent10a3718bdf7761e247b06808b8c72ca75cb0e0ba
parent20d15cfd26b23508242abcead906207bf26175d0
Merge remote-tracking branch 'github/pr/1097'