Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 10 Sep 2010 17:16:12 +0000 (13:16 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 10 Sep 2010 17:16:12 +0000 (13:16 -0400)
commit5edddf87caf566546c8d8e29c45950ee9408dc0c
tree09ba8dd5eb2a125814e9f0fb28ad690a7391dd41
parentfbfda5ccfce40d3f0b5a6076ef02f07e9e5b8fd6
parent5bee98156aaee2ea796703ecd5df2d4a25e9d9b8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info