Code

Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 9 Feb 2008 16:46:48 +0000 (17:46 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 9 Feb 2008 16:46:48 +0000 (17:46 +0100)
commitd0b7e88ee93371c25241f6a1fed3b4918087bb0c
treed39eced43839e3e005ab8c53297000837cc6b5ea
parentf1a764777b71e54407293163aefb07586977b147
parentfb71367524083f90db7c0b4a246d2db6b2b3c737
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd