From: Joseph C. Lehner <joseph.c.lehner@gmail.com>
Date: Tue, 9 Aug 2016 15:20:13 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/jclehner/nmrpflash
X-Git-Tag: v0.9.4~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a3338dc16c3fd7a0351df535a43a1eae0931daae;p=oweals%2Fnmrpflash.git

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

a3338dc16c3fd7a0351df535a43a1eae0931daae