Merge branch 'collectd-4.6' into collectd-4.7
[collectd.git] / .gitignore
2006-06-10 octoocto@leeloo:~/collectd $ svn merge -r812:815 branches...
2006-06-10 octotrunk: add .gitignore