Merge branch 'master' of file:///srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 26 Nov 2008 18:04:28 +0000 (13:04 -0500)
committerJoey Hess <joey@kitenet.net>
Wed, 26 Nov 2008 18:04:28 +0000 (13:04 -0500)
commit81c62f9b01b1c2ceaad75dec6191cbdcce5419ad
tree69610e460ca6fdccbe627d9fd4b822bd303d4b26
parent0a15052262b22eb6349a653a2999ec79430a041b
parent9dead85cb6b92a7ca8e48b4ddd24b7ac4a48cdfa
Merge branch 'master' of file:///srv/git/ikiwiki.info