Merge branch 'pr/381'
authorFlorian Forster <octo@collectd.org>
Wed, 7 Aug 2013 06:39:08 +0000 (08:39 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 7 Aug 2013 06:39:08 +0000 (08:39 +0200)
commitf47430fa93cc9fd374dbb998a4b68c3e3f454c95
tree184c3b60d3f61076815092fca90752d89dc57285
parent21ef84928de2910c3b41fad156afbbf3d0075e7c
parenta1e1d77f21f3568f6392d5bba5c1dfec187c728b
Merge branch 'pr/381'