Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jan 2008 01:52:03 +0000 (20:52 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jan 2008 01:52:03 +0000 (20:52 -0500)
commit4f269010b4a2b5ae9f2a3e342e3ec15ea72c61bb
tree2db40285851ba6a6b1a4aeb2a51bb111feb64425
parentb810552073dce30af9e64821126d254b5b302e4d
parent37f3cd195f8ba1ac0b3f7ad5efa348f7493cccaa
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info