]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 16 Jul 2010 20:11:36 +0000 (16:11 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 16 Jul 2010 20:11:36 +0000 (16:11 -0400)
commita72193a81658e098fdafcd36b9bf20b4834d222e
tree2b927574abaf410502a650f77a4dfca7dde0a7f8
parentfd842e03e6a9d7b14bd161cc7ff6d9d48e8bf00c
parent855cfd0ec741698326ae712b031a7aa28c832327
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info