Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 3 Dec 2007 19:48:21 +0000 (14:48 -0500)
committerJoey Hess <joey@kitenet.net>
Mon, 3 Dec 2007 19:48:21 +0000 (14:48 -0500)
commitd3e190ecec67ae45891d8aee3e3c8af9fc9f8cf9
tree9f5c3b584742ff0228775b98b4b88bfdd705bc96
parente30c3e3bb9c5185382a16e49ce4a6ad86a948efc
parentb1d79117d2bb1484baaf9ef5ebfe614000bf1839
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info