Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Thu, 25 Aug 2011 05:51:38 +0000 (23:51 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 25 Aug 2011 05:51:38 +0000 (23:51 -0600)
commit242344d3e32e7c7cd9270d708555923fa888e4d8
treeed3763f07a7895c136c01f1457e2484f9fbbbe69
parent5c1cf7492b82e63a9db9d0238ecbcd2b59486893
parent94a1b220bbfbb64b9772f3ee64a8e9d353d65e94
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

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