]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into pedigree
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 14 Jul 2008 17:49:07 +0000 (13:49 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 14 Jul 2008 17:49:07 +0000 (13:49 -0400)
commit8d9ec24232ede981face0c3eafbce71b74c4725a
tree0e40e05f5ac292c65d6e4890f2f9141908a74edf
parentcff4201eed692a11412969a25da997279d01b0d6
parent5acfbb50aab538ac43bccb55ba2427cbffa26f0d
Merge branch 'master' into pedigree