Merge pull request #489 from wzyboy/backports/pylzma

author Apprentice Harper <apprenticeharper@gmail.com>

Sat, 5 May 2018 17:36:55 +0000 (18:36 +0100)

committer GitHub <noreply@github.com>

Sat, 5 May 2018 17:36:55 +0000 (18:36 +0100)
author Apprentice Harper <apprenticeharper@gmail.com>
Sat, 5 May 2018 17:36:55 +0000 (18:36 +0100)
committer GitHub <noreply@github.com>
Sat, 5 May 2018 17:36:55 +0000 (18:36 +0100)
diff --cc DeDRM_calibre_plugin/DeDRM_plugin/kfxdedrm.py
Simple merge
author	Apprentice Harper <apprenticeharper@gmail.com>
	Sat, 5 May 2018 17:36:55 +0000 (18:36 +0100)
committer	GitHub <noreply@github.com>
	Sat, 5 May 2018 17:36:55 +0000 (18:36 +0100)