Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@etchedpixels.co.uk>
Wed, 21 Oct 2015 09:59:06 +0000 (10:59 +0100)
committerAlan Cox <alan@etchedpixels.co.uk>
Wed, 21 Oct 2015 09:59:06 +0000 (10:59 +0100)

Trivial merge