]> 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, 13 Aug 2010 21:59:51 +0000 (17:59 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 13 Aug 2010 21:59:51 +0000 (17:59 -0400)
commitfc5b26dd326932c6f3493983ad65f2783d6170e1
tree6aed8ecc775f8b124bc3b2073188307e7792ba23
parentd03e691c506e18a2e93ca653e6821b2fa02caa9f
parent6e905e21a81223d64f759c9753f936e4b2a46064
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info