]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 14 Jun 2008 15:39:34 +0000 (11:39 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 14 Jun 2008 15:39:34 +0000 (11:39 -0400)
commit878e74238e7f9f243e3b0222e2915a148ac8bef1
tree1729727bffc56f571ee2ca4ee0a45e5c1a4dba6c
parent751706b7a53059ca44f3b4e1d1fbe64d8411e245
parent5e1b31fad66b947a739ea9e54f78bb6a6d45d6aa
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info