Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 install/tpl/amavisd_user_config.master

@@ -75,6 +75,12 @@
# Set the log_level to 5 for debugging
$log_level = 0;                # (defaults to 0)

# DKIM

$enable_dkim_verification = 1;
$enable_dkim_signing = 1; # load DKIM signing code,
@dkim_signature_options_bysender_maps = (
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );

#------------ Do not modify anything below this line -------------
1;  # insure a defined return