Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 29 Oct 2009 22:07:04 +0000 (18:07 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 29 Oct 2009 22:07:04 +0000 (18:07 -0400)
commita6b78c97d86b776544b01eaa595d5d335d11731a
tree221ea80451653b0abaef2011d6a8e1b33d18befa
parentc29957e0177c3c654a1ea1feffdba00307449560
parentda58a21d2832fe95fad992d2031c73add5a33300
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info