Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Dec 2009 17:58:59 +0000 (12:58 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 2 Dec 2009 17:58:59 +0000 (12:58 -0500)
commite417e7a66e9109ac510e4b9a7747224d60dba85e
treedefc8b2226c4017fc259667561f70facfbe7f17a
parentf02f806cf70ed19c9e9aa70e232ca46398b3538a
parentbd3bb876c292e5426a0dcf69e30f2e371cc4e59c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info