Merge remote-tracking branch 'upstream/edge' into upstream-master
authorJim Morris <morris@wolfman.com>
Mon, 14 Dec 2015 21:54:01 +0000 (13:54 -0800)
committerJim Morris <morris@wolfman.com>
Mon, 14 Dec 2015 21:54:01 +0000 (13:54 -0800)
commit803e6349eb296ee48d8dca16982a705329a7b673
tree4e7d16b0c402d82b0369067d7b8da676b9c0acba
parent9d27a610634f1dc5a27e67e41faf398a2bdf554a
parent43b718c568499abdf1fc40fe112716ddf06c7dc1
Merge remote-tracking branch 'upstream/edge' into upstream-master

Conflicts:
FirmwareBin/firmware-disablemsd.bin
FirmwareBin/firmware.bin
FirmwareBin/firmware.bin.md5sum