Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 12 Mar 2008 14:35:56 +0000 (10:35 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 12 Mar 2008 14:35:56 +0000 (10:35 -0400)
commitdb0d6c5f012bb2f4bc1df5cd1a032e7469a8d331
tree42b2a917e786f1d88757b5bb409e5047c48d7b37
parent51ee2a2eab5ae9a923393d7a9b4e5a08772ae54d
parent972570b236618b2becf3b8fd5b9e85e4e5e88b7d
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info