Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 15 Aug 2009 20:34:20 +0000 (16:34 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 15 Aug 2009 20:34:20 +0000 (16:34 -0400)
commitac253566aeea1f0afe6db498c92853ada6581e51
tree82427ec7e0b3339c8d398deeb5fafb12e7c7aff9
parent54c2e05ccf8fad1e77d4ee717c48f3622f60b4e4
parente9bc2e96acd5977a35f338ddd392733aaca761f7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info