]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 19 Feb 2010 18:31:37 +0000 (13:31 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 19 Feb 2010 18:31:37 +0000 (13:31 -0500)
commit75baac425b6640ccff9f6d4b3340e07aff972b3d
treeccc38628b3c745a52c7cc2cd0b6a7f0c9a7da6b0
parent21997387d40326e623cddb10a93dcb208025b77a
parent59017c6ae19f661761d0ae3f143fbda643ca1e8d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info