Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 16 May 2009 21:52:30 +0000 (17:52 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 16 May 2009 21:52:30 +0000 (17:52 -0400)
commit7676e3ce636c22130ac2e7c1fbcd46fa939a5b57
treee92436996941e537ab174c323ac3f55122bcb2e4
parent748b99b392a25cbe7e556da40bfbdc6b0bb4b068
parentf827a2af9dfc2519d85ae328b3dca3c752e1bd80
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info