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

Trivial merge