Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 11 Feb 2010 21:29:38 +0000 (16:29 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 11 Feb 2010 21:29:38 +0000 (16:29 -0500)
commitac8f03aa06536b7cced13ef2caa1a2d60cc551aa
treeb42f1dffe8e0455aee9836d791565180f5a5dde7
parent26c68a0c7ae6dd7810a2c4277b6589e03e4e9c47
parent8e0c0214bbef5ac67c5bd0a300e44d20f12f02f2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info