Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 20 Mar 2008 03:00:21 +0000 (23:00 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 20 Mar 2008 03:00:21 +0000 (23:00 -0400)
commitb86c40e220ed5f095f5149fd7d74a65eb570edd1
treeeb2190edfd5e7952e189226b6f6e62c9a4ee3aae
parent8471c5135512586dd4944cd4f7ca3de75063a197
parentc92e9b34ec652748af3a07b329e07c4af7f975d5
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info