Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 20 Dec 2008 22:58:01 +0000 (17:58 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 20 Dec 2008 22:58:01 +0000 (17:58 -0500)
commit92b48bab99e04e7c041434e106179822bd2b1e88
tree00922df7291974a67bb6c6adb7307b2092d1a55b
parentce58338e3d4b1429f255bd40893010d58794943f
parent4b3d3f519d019f47087a62514799578de7cd7f2b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info