Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 19 Sep 2008 17:12:38 +0000 (13:12 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 19 Sep 2008 17:12:38 +0000 (13:12 -0400)
commit343117daf26da5c7d8851901211fc60b03781575
treeadb7a7a9feaa682e892e42f9d03addaa925ef970
parentf22313b1115e1c9093bd5499e399c93412bebf8d
parent4bbc7fbdc2da7ec63aaa90266957219493c4da8e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info