]> 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, 18 Oct 2010 20:40:37 +0000 (16:40 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 18 Oct 2010 20:40:37 +0000 (16:40 -0400)
commit9b52fb16be4c5f569c31d339391c46264c6e43af
treedf287d58fcfe8dd8a25aec3c43b299ad5a16df4a
parent31e23ddc514faba17bfeb213a6ecaafc806aae1b
parentd2b7fcda9a3b302cfabf528e37dd3366030ebb6b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info