Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
-- database patch for getmail read_all option
ALTER TABLE `mail_get` ADD ( `source_read_all` varchar(255) NOT NULL default 'y');