From: Bdale Garbee <bdale@gag.com>
Date: Tue, 30 Apr 2013 22:40:23 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/hw/teleterra
X-Git-Url: https://git.gag.com/?p=hw%2Fteleterra;a=commitdiff_plain;h=560b055c023e1eb512a4a85dd8217ce01960fa58

Merge branch 'master' of ssh://git.gag.com/scm/git/hw/teleterra

Conflicts:
	.gitignore
	Makefile
---

560b055c023e1eb512a4a85dd8217ce01960fa58