Merge branch 'dm/openvpn'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 1 Jan 2009 11:36:40 +0000 (12:36 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 1 Jan 2009 11:36:40 +0000 (12:36 +0100)
commitb5cac450499d563e64a499082866acf846200410
tree8a38f22aca85d9644c5ef17a4809c98a4f85020d
parent5b96248ba2fba7a07458716a5a1610a6e68bc469
parente17a4e5fc3f376d15a47a36031ec060cfd2635e8
Merge branch 'dm/openvpn'
src/collectd.conf.pod