]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 26 Jun 2008 22:13:31 +0000 (18:13 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 26 Jun 2008 22:13:31 +0000 (18:13 -0400)
commit3c86cd4a6a8f2801a39403ca9db893a18ad1b302
treee21867b9779c6592ac926cb166f7a5b346b2eee6
parentfdc8d981d2555a4a2a7bb8ed1ef1cee7d03749dc
parent82c78da52046af23666bcc86026b88a4eb972372
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info