From: Joseph C. Lehner <joseph.c.lehner@gmail.com>
Date: Fri, 13 Jan 2017 10:39:12 +0000 (+0100)
Subject: Merge branch 'master' of github.com:jclehner/nmrpflash
X-Git-Tag: v0.9.10~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=495891fb6b64825082a5d6baba886c4cc045b9dd;p=oweals%2Fnmrpflash.git

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

495891fb6b64825082a5d6baba886c4cc045b9dd