From: Joseph C. Lehner <joseph.c.lehner@gmail.com>
Date: Thu, 9 Jan 2020 20:21:26 +0000 (+0100)
Subject: Merge branch 'master' of github.com:jclehner/nmrpflash
X-Git-Tag: v0.9.14^0
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=47817a6dd724f1a9bc2c249c2f2146990696dbb1;p=oweals%2Fnmrpflash.git

Merge branch 'master' of github.com:jclehner/nmrpflash
---

47817a6dd724f1a9bc2c249c2f2146990696dbb1