Code

Merge branch 'collectd-4.9' of verplant.org:/var/lib/git/collectd into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 12 Dec 2009 22:36:07 +0000 (23:36 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 12 Dec 2009 22:36:07 +0000 (23:36 +0100)
commit94c927f36710de531c2ab228d374ae9f24b7b873
tree86b4bd9f6e3ebeeb1a304f51e491e3c2a06f9b9a
parentaceb06f41f0a046983fa443c0452bbde546314cf
parent2de26303a2fb5ad782f4d309cbf6b48e4901288b
Merge branch 'collectd-4.9' of verplant.org:/var/lib/git/collectd into collectd-4.9