[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 ChangeLog      |   24 ++++++++++++++++++++++++
 src/netlink.c  |    4 ++--
 version-gen.sh |    2 +-
 3 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 2d84895193c665c4253c4a3e5b9092aea9e9f95d
Author: Florian Forster <octo at collectd.org>
Date:   Sun Jan 26 08:52:52 2014 +0100

    Bump version to 5.4.1; Update ChangeLog.

commit f2106c1e8c35c24e274f5ec08b70e967ade27ba4
Merge: 9b9a04b 0fc0ad7
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Thu Jan 23 23:22:34 2014 +0100

    Merge remote-tracking branch 'origin/pr/524'

commit 0fc0ad7887b32886b50366c4b4556d42dc6d5472
Author: Marek Becka <marek.becka at superhosting.cz>
Date:   Thu Jan 23 19:02:56 2014 +0100

    removed invalid space from macro definition