Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 20 Dec 2008 23:07:45 +0000 (18:07 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 20 Dec 2008 23:07:45 +0000 (18:07 -0500)
commit5d5732d67313a66f8acbb9b78ca3ed97c636f61a
tree146c938caa08e5416d2f03ca8b3f33a10e9081f5
parent0f03af381625bc16d51140a949ded304c3686e7b
parentdd4dff03506c5c8f9dee1fa59548e4e653bb0053
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info