Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 7 May 2008 18:12:14 +0000 (14:12 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 7 May 2008 18:12:14 +0000 (14:12 -0400)
commited75653e4d1ebc9827601ab3649e1422f45ef338
tree23869e1474fbf377bfa5ef3a2fff6313e67bcae8
parentec866f83703e63c0750df0b955a3288434a127b3
parentb731fce466124f02dab7e26d759042c3ee4be52a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info