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)
commitc32524e2381a933fe1a12d024ca51dc413281b50
tree5fa3729ca3505f84a6cb82e13ec54dc5bb77041d
parentba95b4f8aa3efd21cdc441111707ffbcbe912928
parent395803fed7ddcb7d461436d7afe85dd2e1d20b18
Merge remote-tracking branch 'origin/master'

* origin/master:
  Adjust backupfile handling
  Adjust