Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 9 Jul 2008 04:25:15 +0000 (00:25 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 9 Jul 2008 04:25:15 +0000 (00:25 -0400)
commit458e5dc65f4ac9ac016c843b48bf08203c920b08
treea0445f8601731e343ea6d8ebd0bfead0512fe1b3
parent65c984041c5eb0b89c0ce5ae87a0a395ca48d69b
parentec8f5a333ba83da327cc071b69ed5ef8bda0034f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info