From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 7 Jul 2017 20:18:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/HEAD'
X-Git-Tag: 1.2.1.1~4
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/commitdiff_plain/278e43d0c27875a1355ebaf3bef6d0f5df739626

Merge remote-tracking branch 'origin/HEAD'

* origin/HEAD:
  catacomb/pwsafe.py: Fix stupid error which breaks `delete'.
---

278e43d0c27875a1355ebaf3bef6d0f5df739626