Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 14 Mar 2008 22:55:34 +0000 (18:55 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 14 Mar 2008 22:55:34 +0000 (18:55 -0400)
commit6263c7c36c662b7292f20f38a2d491e15524faff
tree828ca38f3ccb45bb6f1b8bd9a2313d6a899f5379
parent7b6686ce7061c28eba88610b2ee55e4a0379ff1e
parentb2f5adc4a5246681322063eff40a9af1485101e2
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info