Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 9 Oct 2008 23:14:55 +0000 (19:14 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 9 Oct 2008 23:14:55 +0000 (19:14 -0400)
commitf3bfa1a79763c5dad1ca415c902ea51b6bccce83
tree7da9e2b9c60316ccb45241142784084f4868403e
parenta473cb2f74738d369130135b8c3ce0f6ef66af02
parent484e42fd48f0bc6a1d9b7b27f2e5baf5a2ff8200
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info