Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 7 Dec 2007 06:10:10 +0000 (01:10 -0500)
committerJoey Hess <joey@kitenet.net>
Fri, 7 Dec 2007 06:10:10 +0000 (01:10 -0500)
commit4f5916db5c95c2856a6d621d48116b85c2b7552e
tree2f8862ce2df17b1578b8d1f4d2c27abbf0063f67
parent267885009f616e909d2d326ca8985677a2f395a3
parent83ba6270187ea6e2cd71623993052fa402a7d16c
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info