Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 4 Mar 2009 18:51:55 +0000 (13:51 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 4 Mar 2009 18:51:55 +0000 (13:51 -0500)
commit108ad03cc81d3ebbd668eab879789f940951d293
treef380c6d695bc0e594f830649ecce49ba7179a6db
parent89bfa1e392bc03f8e9f5b27d63ff420315690fca
parent2fde5b4a6a7df1c1e0fa5231f2cc60bef5a74c08
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info