Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Mar 2008 19:55:38 +0000 (15:55 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Mar 2008 19:55:38 +0000 (15:55 -0400)
commitcdf88c88216c75051e2e3cfc7844da4611e7c89b
tree3ed0894772d77bc0cc4fec88702b48b6c252ae13
parentc2dd8de9a82a0a941a864b65eeedddeeb25483cf
parentc59405e6433c892f46ec722387cc84fe5a6e096b
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info