Merge branch 'master' into devel

This commit is contained in:
Paul Gear
2013-11-05 09:34:29 +10:00
10 changed files with 221 additions and 14 deletions

View File

@@ -36,5 +36,7 @@ $config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth
#$config['nets'][] = "172.16.0.0/12";
#$config['nets'][] = "192.168.0.0/16";
# Uncomment the next line to disable daily updates
#$config['update'] = 0;
?>