Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 13 Jan 2009 00:10:47 +0000 (19:10 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 13 Jan 2009 00:10:47 +0000 (19:10 -0500)
commit7e6abdfd1c4d72df154f8e3ac64cdec9317c1c39
tree28fe6624ade1dd1964f169b3bd5e9709fe1c5b42
parentb70c64d3f8c150abacbd5d3330409d8280a4f53f
parent7b1026b1a803e160c360ee8f4d19004b466f8b7c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info