Merge branch 'thh-pickfromupstream' into next * thh-pickfromupstream: Fix whitespace and typo. Update documentation to 4.12. Add correct timestamp to mbox when processing. Don't remove empty mailbox files/maildirs. Fix UVreadmail.pm Add option to compare ballot to sample ballot. Documentation: Add votename to UVmenu.
Add option to compare ballot to sample ballot. It may be desriable to compare a ballot to a sample ballot when checking votes. * Add options "diff" and "sampleballotfile" to usevote.cfg an UVconfig.pm * Add menu option to UVmenu.pm Picked from upstream. Signed-off-by: Thomas Hochstein <thh@inter.net>
Merge branch 'thh-pickfromupstream' into next * thh-pickfromupstream: Adapt some templates to upstream version. Fix handling of template files like upstream. Fix problem with recognition of ANNULLIERUNG. Add option to read from Maildir. Update version number and copyright. Drop commonly used accounts from mailpatterns. Update documentation from upstream.