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)
commit0470756d59c43b341cabfd0833a38245149bb770
treeabe9264053d962afbef98fda3750e96b1f79ff18
parent6422cdc89300a908d613765a85d075d9d5bb68be
parent075e6efe35c3b77e0d4d2d6a868a12f99f075270
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.
This page took 0.010076 seconds and 4 git commands to generate.