Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 29 Sep 2008 22:10:19 +0000 (18:10 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 29 Sep 2008 22:10:19 +0000 (18:10 -0400)
commit0d3878896fa250cd1a6d4b1e7991714ca8478f36
tree2ccc379dab3d465e4e8d3540f99ec3dcd7b75113
parentbb4211e326bd16099cb353353055497f2fb5a0c9
parenta44d9d8e1245e7547b2a098674270378feef46e5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info