]> 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, 29 Nov 2010 16:06:26 +0000 (12:06 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 29 Nov 2010 16:06:26 +0000 (12:06 -0400)
commita3672af973563dc13b4da56e3d8c58064b67edd7
tree3f5d3095fe57bdc77a0793c6315a578846cb4af7
parent78a22e2eb2d3b963c48067367f6ded5da061eb81
parent2e2e9638c8010295d730f3e2f947a33a5929f051
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info