Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 31 May 2008 18:37:27 +0000 (14:37 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 31 May 2008 18:37:27 +0000 (14:37 -0400)
commitcc26a499253b5a0458924992f70678b81811ec70
tree6e15990838225f3916754702b9270e92b2414edc
parentc00890a2f033aa36dd5d88f8d3bdd5b7a927a687
parentff6433179e7b0d6d5c04ec09f648c619d16e4eb8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info