Merge branch 'master' into 'master'

Marius Cramer

2014-01-27 e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c

 server/conf/getmail.conf.master

@@ -1,6 +1,8 @@
[options]
message_log = /var/log/getmail.log
# message_log = /var/log/getmail.log
message_log_syslog = true
delete = {DELETE}
read_all = {READ_ALL}

[retriever]
type = {TYPE}
@@ -11,5 +13,5 @@
[destination]
type = MDA_external
path = /usr/sbin/sendmail
arguments = ("-bm", "{DESTINATION}")
arguments = ("-i", "-bm", "{DESTINATION}")
unixfrom = true