Code

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)
1  2 
src/email.c
src/liboconfig/parser.y
src/network.c

diff --cc src/email.c
Simple merge
Simple merge
diff --cc src/network.c
Simple merge