Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sat, 28 Sep 2013 05:52:38 +0000 (23:52 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 28 Sep 2013 05:52:38 +0000 (23:52 -0600)
commitcc83ccd0d8ce35b62c0348b512c271de3961a90c
tree0dfaacf1f4d840a243beb67a28039532e030c121
parent8bbb6f4239f8f6cb841794ab000c867d473529ed
parent78c7d8338d49c0d7162bb6f89f400100bc66c9c8
Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum

Conflicts:
packages/Makefile
packages/Makefile