Merge remote-tracking branch 'origin/master'

[rrdd] / example_database.conf

rrd_database = ( 
@include "database.sysinfo.conf"
    );