Merge remote-tracking branch 'origin/HEAD'

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

diff --git a/catacomb/pwsafe.py b/catacomb/pwsafe.py
index 4b4b99494eef210f344378e4bb7e5f88b6f4fd45..cfbac7ed8e8081ff01707526dcf6a1040e8406af 100644 (file)
--- a/catacomb/pwsafe.py
+++ b/catacomb/pwsafe.py
@@ -472,7 +472,7 @@ class StorageBackend (object):
     database is open for writing.
     """
     me._check_write()
-    me._del_passwd(label, payload)
+    me._del_passwd(label)
 
   def iter_passwds(me):
     """