Merge branch 'master' of file:///srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 5 Sep 2008 16:38:19 +0000 (12:38 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 5 Sep 2008 16:38:19 +0000 (12:38 -0400)
commite79e3143509d3f4c0273e8eed5956d264cbc56e2
tree6bc93b8cc233fef1ca4b9b0c4020256a790d1a4d
parentee9381a24483d74aa6bd66d3b69145ba081250fb
parentf9618417753fc680eaaa6b42b8555e625103a619
Merge branch 'master' of file:///srv/git/ikiwiki.info