]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 23 Oct 2010 20:33:29 +0000 (16:33 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 23 Oct 2010 20:33:29 +0000 (16:33 -0400)
commit9f301569496e7d4019f41c34be5f07b828952ba8
tree6e0e9fd33b8ed22f40e9c4538b216168ea1bb063
parent9d78e484da5c0f8734cbc26bb1a8f89617d6afe8
parentbb8fc299acf377846caa189cd17426e4abd2ce74
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info