Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 12:52:22 +0000 (14:52 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 12:52:22 +0000 (14:52 +0200)
commitf5adf265a374e5e0dba89a4a9903e7719dc57039
tree1c35c40ca743b0234cc6d0f2dcb226fe7d9cf050
parentcf33da9ad00ac94931a2c87563f8d007a996f1ad
parentdd324a1592259913e6e92d3b54e6fa2b0c5f38f7
Merge branch 'collectd-5.4' into collectd-5.5
src/email.c
src/liboconfig/parser.y
src/network.c