]> 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, 12 Mar 2010 17:52:34 +0000 (12:52 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 12 Mar 2010 17:52:34 +0000 (12:52 -0500)
commit3fd202db7b3b3ea4eb8fc7ecda8db38f8ed788af
tree9a8024858a924a3fa69f5c09c27dd8b67acde3fa
parent9c274a001a17df01d9ea609c1c39eae72e4c6404
parent58a6847cfb445dbb87716e4064f8151cc44a233a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info