Merge remote-tracking branch 'origin/master'
authorJoerg Jaspert <joerg@debian.org>
Sun, 10 Dec 2017 14:52:33 +0000 (15:52 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sun, 10 Dec 2017 14:52:33 +0000 (15:52 +0100)
* origin/master:
  Adjust backupfile handling
  Adjust


Trivial merge