Merge branch 'master' of github.com:jclehner/nmrp-flash
authorJoseph C. Lehner <joseph.c.lehner@gmail.com>
Mon, 8 Feb 2016 15:28:08 +0000 (16:28 +0100)
committerJoseph C. Lehner <joseph.c.lehner@gmail.com>
Mon, 8 Feb 2016 15:28:08 +0000 (16:28 +0100)

Trivial merge