Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 28 Aug 2008 19:03:26 +0000 (15:03 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 28 Aug 2008 19:03:26 +0000 (15:03 -0400)
commit9b21a540dd54da0da6ec85c5a427cefbd1a0116b
treeae5e9a527e07a25330aab1d71b8b4336cb5b6374
parentb42233c7890548860c9c768647484962bd72cf79
parentb0debf1f56c0fc45bbbea5c9c7a9d9f406f0773a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info