Merge remote-tracking branch 'upstream/master' into edge
authorsoldierkam <soldier.kam@gmail.com>
Wed, 20 Aug 2014 19:14:32 +0000 (21:14 +0200)
committersoldierkam <soldier.kam@gmail.com>
Wed, 20 Aug 2014 19:14:32 +0000 (21:14 +0200)
commitaacbe57f9cc5a8c5f3b4f9c3f0d408c08b03be70
tree1d8d9c67d03374bcab0b88b1a616ea5e32ad0dc2
parentb8c26a0eabb0bdcf4d9d05b369b5def4232fd979
parent886396610f2a5d40156181236a3da9047ed897b0
Merge remote-tracking branch 'upstream/master' into edge

Conflicts:
FirmwareBin/firmware.bin