Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 9 Jun 2009 01:41:42 +0000 (21:41 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 9 Jun 2009 01:41:42 +0000 (21:41 -0400)
commit62ee542b1d9ea7a8cb57f42b3255c6a500664262
tree35cfef5efc7f4dcdf86d7d5e9e5db3ce8b4c26d6
parentf57672f66379c84cd37b9c5a581788aefbb34358
parentdf19034d79139814f0d1028db6c02997c4587b0b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info