Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 18 Dec 2009 08:43:36 +0000 (09:43 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 18 Dec 2009 08:43:36 +0000 (09:43 +0100)
commit72fefab2a6bf8111fb68816a1c1da30afa5c2d92
tree5007c78d560c2895c4ebcaa8654c8736728689a1
parenta86c1a6b695f5f967fb102da12a9f93dcee26ed3
parenta664c795f60b31a2dbd34e1a615a583b47002a07
Merge branch 'collectd-4.7' into collectd-4.8

Network plugin license change with Aman Gupta's permission.

Conflicts:
ChangeLog
version-gen.sh
ChangeLog
src/network.c
src/plugin.c