Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 11 Aug 2008 16:47:51 +0000 (12:47 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 11 Aug 2008 16:47:51 +0000 (12:47 -0400)
commit49d56c3957668e54b4eb475f195ab019adffae40
tree040e9e411c8f8cf53bd03cc15745c492955d226d
parent6edd22808effa2b83947eee9986b901247d8871b
parenta6fa03c9615ffab24909d6fac4d3bf06a104f400
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info