Merge branch 'master' of ssh://git.gag.com/scm/git/hw/teleterra master
authorBdale Garbee <bdale@gag.com>
Tue, 30 Apr 2013 22:40:23 +0000 (16:40 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 30 Apr 2013 22:40:23 +0000 (16:40 -0600)
commit560b055c023e1eb512a4a85dd8217ce01960fa58
tree5a6ce15a0f21db98d7410b3cb7a818d299b183f6
parent4092253c05e94a5822414c63ac403f1f3db5bcca
parent7add9a6d042fe475e343ebd25c30aa297205e4e9
Merge branch 'master' of ssh://git.gag.com/scm/git/hw/teleterra

Conflicts:
.gitignore
Makefile