Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 14 Mar 2010 04:59:35 +0000 (23:59 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 14 Mar 2010 04:59:35 +0000 (23:59 -0500)
commit0f777be509f33a1f4b8e4b03907a597131805432
tree92d8e5d96cf65da457164a0f83c00fe3a514cfb7
parent725a1cf0e8d1fbdb7f449b632ee1fa3cb84835c7
parent7bca48f5ce8233cada3a4d87a4c93c1fed8aae80
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info