Merge branch 'master' of https://github.com/EtchedPixels/FUZIX
authorAlan Cox <alan@etchedpixels.co.uk>
Tue, 18 Nov 2014 11:54:24 +0000 (11:54 +0000)
committerAlan Cox <alan@etchedpixels.co.uk>
Tue, 18 Nov 2014 11:54:24 +0000 (11:54 +0000)
Merge with patches applied via github


Trivial merge