Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 11 Sep 2008 19:14:16 +0000 (15:14 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 11 Sep 2008 19:14:16 +0000 (15:14 -0400)
commitf77e2078726124efc9ab87b28c20b1d004012fcd
tree42f5cc3d45f1560c714a17a5a599f266a1df6a9a
parenta87cfbcb8d0b97a4261cd9337bd80a16dde266ce
parentfb4a4e86335f21e88fe5eea763fb9dcdbe58492f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info