Code

Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Fri, 14 Oct 2011 20:42:09 +0000 (22:42 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 14 Oct 2011 20:42:09 +0000 (22:42 +0200)
commit2652653c3db161442d28709d79c3f2d81ab571ee
treee3df3d6938674b9da0b4fa4abd5bb6dc34a90da9
parent42ed9d31639cc7dcb3d558c0be08106a21b319d4
parent7b2265a744ca9a3c7c042748b542deae1b6b39c6
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog

Change-Id: I65f02dbcad46460f18f356bc8d32eb15a7a352c2
ChangeLog