]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 20 Dec 2010 19:11:53 +0000 (15:11 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 20 Dec 2010 19:11:53 +0000 (15:11 -0400)
commit4d93407e19d553a5c62cb8b7ae4f2a0b3fbefbfb
tree3ed64ea23642c3cf9ee37e13a5b1e1481d5dab7f
parentace0ae206538b486484a047ec07109db319eff9a
parent1e34e4d34168717dcf61504554cbf1137d34b87e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info