TeleMini sn re-assigned from 92 to 96 to resolve conflict.
authorBdale Garbee <bdale@gag.com>
Wed, 28 Aug 2013 21:19:15 +0000 (15:19 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 28 Aug 2013 21:19:15 +0000 (15:19 -0600)
commit77f6661cd893dadf422376a7302be97105f4a9a8
tree35ab58eceb47c59e5039ec91c8b4d6b249e4ac43
parent9bf704fa540dcd377503847f00bec1b3db26bbb6
parent02aadfc09bde9951cd4fa9b90241bd4c9af8e589
TeleMini sn re-assigned from 92 to 96 to resolve conflict.

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

Conflicts:
production.mdwn
production.mdwn