Merge branch 'master' of github.com:jclehner/nmrpflash
authorJoseph C. Lehner <joseph.c.lehner@gmail.com>
Fri, 13 Jan 2017 10:39:12 +0000 (11:39 +0100)
committerJoseph C. Lehner <joseph.c.lehner@gmail.com>
Fri, 13 Jan 2017 10:39:12 +0000 (11:39 +0100)

Trivial merge