From: Bdale Garbee <bdale@gag.com>
Date: Thu, 25 Aug 2011 06:34:49 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.0~9
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=73abe19acf709c00f5352ec12e8cd6edae1d1963

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
	doc/altusmetrum.xsl
---

73abe19acf709c00f5352ec12e8cd6edae1d1963