From: Thomas Hochstein <thh@inter.net>
Date: Sat, 15 Feb 2014 17:45:53 +0000 (+0100)
Subject: Merge branch 'thh-pickfromupstream' into next
X-Git-Url: https://code.th-h.de/?p=usenet%2Fusevote.git;a=commitdiff_plain;h=0470756d59c43b341cabfd0833a38245149bb770

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.
---

0470756d59c43b341cabfd0833a38245149bb770