Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 29 Aug 2008 17:21:25 +0000 (13:21 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 29 Aug 2008 17:21:25 +0000 (13:21 -0400)
commit494b36acd6b23502be9c907b2d3f7121c8f1576b
treec720f7f2fc04af306ab32fb2f7ec3ed96ff9a9a0
parent70d8df54a51ff6b6e455627783cb00ff64f93963
parent18e531f4a8d71a47e0a919e7dcadde29083f6772
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info