chiark / gitweb /
Merge remote-tracking branch 'origin/HEAD'
authorMark Wooding <mdw@distorted.org.uk>
Fri, 7 Jul 2017 20:18:42 +0000 (21:18 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 7 Jul 2017 20:18:42 +0000 (21:18 +0100)
commit278e43d0c27875a1355ebaf3bef6d0f5df739626
tree257c7a93cf804a107cf7dddbffd9271d916f0aa9
parentd67d49b98ce82ab275e519ffe93758b7d2495bc9
parent1d93191e19f43bce5b8f3bd3447c755c1d615f56
Merge remote-tracking branch 'origin/HEAD'

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