Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 15 Feb 2010 00:11:35 +0000 (19:11 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 15 Feb 2010 00:11:35 +0000 (19:11 -0500)
commit8805d6fff22878497cc72d69509b2008e77bd20d
tree6967e25bccc87b011ac578539109b2769b22546f
parentc21eb47e627de2dfd5409b459b2e11498c534f3c
parent693fb3b18654abae84efeccd046a358f56dc2be7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info