]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Feb 2008 18:56:34 +0000 (13:56 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Feb 2008 18:56:34 +0000 (13:56 -0500)
commit858d955acf92683d21369b16094cd517698ed9e6
tree1ae2f6585490a45c4c1fcc96acb2e2a093bb5fb6
parent6afbd9939ac8cd171e7cf8376f0d0c0a4bf3d516
parent6c1cb3f985a0f1d8568ff386cc40e35405bad4f7
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info