Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Tue, 17 Dec 2013 21:09:30 +0000 (14:09 -0700)
committerBdale Garbee <bdale@gag.com>
Tue, 17 Dec 2013 21:09:30 +0000 (14:09 -0700)
commit90c88bab305c43eb62f964fd3ff350b8b0b5320d
tree87ca05ca720ba132f6f37f9d7ff4241f51f6dbfd
parentd5d6d10ceb724081c7cf89a3885d7e6c3da14604
parentdffbdd93d7a86a12d83a412de37dfd2a5f063995
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

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