Merge branch 'master' of github.com:jclehner/nmrpflash
authorJoseph C. Lehner <joseph.c.lehner@gmail.com>
Fri, 12 Feb 2016 13:07:16 +0000 (14:07 +0100)
committerJoseph C. Lehner <joseph.c.lehner@gmail.com>
Fri, 12 Feb 2016 13:07:16 +0000 (14:07 +0100)

Trivial merge