]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 25 Sep 2010 19:00:31 +0000 (15:00 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 25 Sep 2010 19:00:31 +0000 (15:00 -0400)
commit0740855836c07165c9dd219ac1e910bb72e2409f
tree7e1355d9df27bd935f847125230d9a6906ae1379
parentaac1428491c850b74800f59926dcbc3c7bc6dd84
parent66e3a164223bc36d14c5b304f902f6d5413045c7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info