]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
projects / packages / o / openafs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18f965f f37a40f)
Merge commit 'upstream/1.5.77' into experimental
authorRuss Allbery <rra@debian.org>
Tue, 21 Sep 2010 20:51:33 +0000 (13:51 -0700)
committerRuss Allbery <rra@debian.org>
Tue, 21 Sep 2010 20:51:33 +0000 (13:51 -0700)
Conflicts:
acinclude.m4


Trivial merge