Ken Dreyer 3336efd173 Merge branch 'master' into el5 ... Conflicts: .gitignore cacti.spec		2011-10-27 12:37:56 -06:00
.gitignore	update to 0.8.7h	2011-10-27 12:17:56 -06:00
cacti-httpd.conf	auto-import cacti-0.8.6h-4 on branch devel from cacti-0.8.6h-4.src.rpm	2006-02-07 01:42:50 +00:00
cacti.logrotate	auto-import cacti-0.8.6h-4 on branch devel from cacti-0.8.6h-4.src.rpm	2006-02-07 01:42:50 +00:00
cacti.README.Fedora	Fixing bug #182033 - cron job fails when database is not configured	2006-02-22 08:34:48 +00:00
cacti.spec	Merge branch 'master' into el5	2011-10-27 12:37:56 -06:00
sources	update to 0.8.7h	2011-10-27 12:17:56 -06:00