Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 8 Oct 2010 23:32:20 +0000 (19:32 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 8 Oct 2010 23:32:20 +0000 (19:32 -0400)
commit726270ad0017cfd1d1c36e9a765eb0638bec86f6
treebfd395a2d069469592fd8bb0f3347fd391d64dea
parent59ea972fc91005699b14204c989c2d29997a3009
parent7aba3bd74696dc5c3f51448db29bfba0c58d6529
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info