Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 18 Feb 2009 00:37:49 +0000 (19:37 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 18 Feb 2009 00:37:49 +0000 (19:37 -0500)
commit3df883ba94d7b06697ce15bed2058768bc8de006
tree8b96652a9e3e4a02fcdc49a0d709c263bf631661
parent5f96944dd5ad099d96adbf0273b4dc7d1da98829
parentedad904f4c3b8621d11cd4e45e7bc5a669752d11
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info