Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 31 Oct 2007 21:17:37 +0000 (17:17 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 31 Oct 2007 21:17:37 +0000 (17:17 -0400)
commitb39be3e234c5ed5b5b12746d099d024ea1152776
treea251a19bbd6b1d98932704ec773c32db61b261b9
parentc5d9c0d6b641115072137703c61d54229077778a
parenta715338868a5462b0cecc440ec48dc596debe34c
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info