]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 14 Jun 2010 18:11:35 +0000 (14:11 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 14 Jun 2010 18:11:35 +0000 (14:11 -0400)
commit98ad266119aaca7fd2b891fb01867cf5e9c46b67
tree957ab839e04f5a8a770cc21122a2668c24cc99af
parent88b080f8a40840c62abd76fbf0330cb580713f1f
parent8746480c259a9d52b1661f6832428cfeeb3458bd
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info