git.michaelhowe.org Git - packages/o/openafs.git/commit

]> git.michaelhowe.org Git - packages/o/openafs.git/commit

projects / packages / o / openafs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: be05a12 ab59d95)

author	Russ Allbery <rra@debian.org>
	Tue, 6 Apr 2010 21:40:01 +0000 (14:40 -0700)
committer	Russ Allbery <rra@debian.org>
	Tue, 6 Apr 2010 21:40:01 +0000 (14:40 -0700)
commit	b5e88d685f7c2fef72f8c78f7148657c951b6e77
tree	3c5fd13240ac5e08d653cee5b31b1eabd0c8e024	tree \| snapshot
parent	be05a1244f0252833d4cc325c92479c68e686e75	commit \| diff
parent	ab59d95d25e7daac3bec2d9e4c272c643f855787	commit \| diff

Merge commit 'upstream/1.5.73.3' into experimental

Conflicts:
src/tviced/Makefile.in