Merge branch 'passive'
authorBdale Garbee <bdale@gag.com>
Sun, 6 Oct 2013 05:54:52 +0000 (23:54 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 6 Oct 2013 05:54:52 +0000 (23:54 -0600)
commit0f83a16d7fbf6a60e91627ab9a0396c804961182
tree47f5913a1a97a1934cef73d458cfad5293dd3f84
parent3dbfe9e0eae2b741d989b5d136741c01a60f9275
parent2bb66eae9893bed25b09ce22379a1704763a6f45
Merge branch 'passive'

Conflicts:
telemega.pcb
telemega.sch
telemega.pcb