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

[Florian Forster]

 contrib/collectd_network.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 103eff4c982d162e8317c222ca2ffbe2a2bb9ad5
Merge: d560265 f23f80c
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jul 3 11:51:46 2013 +0200

    Merge branch 'fix-dstype-ordinal-decode_network_values' of git://github.com/aelse/collectd

commit f23f80cf88cbb97a088dfdcb0e70c668d7e5c7ff
Author: Alexander Else <alexander.else at team.telstra.com>
Date:   Mon Jul 1 16:17:12 2013 +1000

    decode_network_values dstype is ordinal value of string literal