Merge branch 'collectd-4.9' into ff/routeros
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 24 Dec 2009 10:58:45 +0000 (11:58 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 24 Dec 2009 10:58:45 +0000 (11:58 +0100)
commitfd89cd48430cb6edf752f73a3952dd42b1fce7ab
treeb3a1c3f2c11031347075d6e4768dbfeb73411338
parent64df08d761d74f493633129ff7e48044903c94bb
parente2a838e0a38126a1c870e1608dcad73d1c2976eb
Merge branch 'collectd-4.9' into ff/routeros

Conflicts:

src/routeros.c
src/routeros.c