Merge branch 'thh-pickfromupstream' into next
authorThomas Hochstein <thh@inter.net>
Sat, 15 Feb 2014 17:45:53 +0000 (18:45 +0100)
committerThomas Hochstein <thh@inter.net>
Sat, 15 Feb 2014 17:45:53 +0000 (18:45 +0100)
* 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.


Trivial merge
This page took 0.009893 seconds and 4 git commands to generate.