Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 5 Feb 2010 18:46:35 +0000 (13:46 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 5 Feb 2010 18:46:35 +0000 (13:46 -0500)
commit919d66b3257a7733049b8ac158ae6c80e0613ef0
treefc9967f8cd7ad473c35e834b48a761e778f0f773
parent34a64557cf5f4a913c07f04d021debdd5fb58b1b
parent0e67c26e2e656cf54aa13033c56e204237ef5775
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info