Merge branch 'debian' of ssh://mailsync.git.sourceforge.net/gitroot/mailsync/mailsync into debian
(I did an commit --amend localy after having pushed which made local and remote diverge)
Authored by: Tomas Pospisek 2013-01-26
Parents: [0d3202][b70232]