]> 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: c3b33c5 db2ce32)
Merge commit 'upstream/1.6.0.pre4' into experimental
authorRuss Allbery <rra@debian.org>
Thu, 31 Mar 2011 21:18:09 +0000 (14:18 -0700)
committerRuss Allbery <rra@debian.org>
Thu, 31 Mar 2011 21:18:09 +0000 (14:18 -0700)

Trivial merge