]> 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>
Mon, 1 Feb 2010 20:17:13 +0000 (15:17 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 1 Feb 2010 20:17:13 +0000 (15:17 -0500)
commit4a1518cebafc1858393844eb348da963c9c6a3e5
treef61e2f8cada62158b1ae29336734be1002e7062f
parent1e0b724bac67d3f31bfb3620876937ec4291a326
parent438cb249a3f2bc9e04ea4b50d247daa7a43c281d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info