From: Bdale Garbee <bdale@gag.com>
Date: Sun, 17 Aug 2014 18:33:06 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
X-Git-Url: https://git.gag.com/?p=web%2Faltusmetrum;a=commitdiff_plain;h=cc5b317ac02657f6d32f12bb404310a9fc76b78f

Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum

Conflicts:
	production.mdwn
---

cc5b317ac02657f6d32f12bb404310a9fc76b78f
diff --cc production.mdwn
index e7e27db,9a10dc5..30738df
--- a/production.mdwn
+++ b/production.mdwn
@@@ -424,8 -424,6 +424,12 @@@ Prototype build of 3 EasyMega v0.1 by B
  Production run of 108 pieces of TeleGPS v1.0 by
  [Advanced Circuits](http://4pcb.com), received 2014.05.21.
  
- ## sn 1982-2081 ##
+ ## sn 1982-1983 ##
+ 
+ Build 2 TeleFire v0.2 by Keith 2014.07.12
++
++## sn 1984-2083 ##
 +
 +Production run of 100 pieces of EasyMega v1.0 by
 +[Advanced Circuits](http://4pcb.com), received 2014.08.14.
 +