Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Thu, 25 Aug 2011 06:34:49 +0000 (00:34 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 25 Aug 2011 06:34:49 +0000 (00:34 -0600)
commit73abe19acf709c00f5352ec12e8cd6edae1d1963
tree2093b18911bcc5ad88d2349db44808034fcef771
parent1bd781da934c738e0c9294197c7eb622b0710a9a
parent5158493c8df527e7527057c719c75248609eb3dc
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
doc/altusmetrum.xsl
doc/altusmetrum.xsl