Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 19 Nov 2008 22:31:17 +0000 (17:31 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 19 Nov 2008 22:31:17 +0000 (17:31 -0500)
commit276b814bb9f53291f1ebe1cc510d49f1ba4719c8
tree011ffb71e1081a1770d1adf2d5a3db1ddfd431b4
parenta493752a4d90f3ff72d30f6b0527c806d9f8ae72
parent4dc7143b5a020dcc881ea595ac678d3e845b5b9a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info