]> git.michaelhowe.org Git - packages/o/openafs.git/commit
Merge branch 'upstream' into bug/compiler-flags
authorRuss Allbery <rra@debian.org>
Thu, 12 Feb 2009 18:37:25 +0000 (10:37 -0800)
committerRuss Allbery <rra@debian.org>
Thu, 12 Feb 2009 18:37:25 +0000 (10:37 -0800)
commit9d3cef3411af638d94bf8fd260be51a9951263c8
treef00f6475191edc262692650ac9e0f832435df43b
parent34cfdbaf4c34f343bd51a1915a35d90028c32bb3
parent1949585d2da4e7406568fd5f1de69e4aab3d9126
Merge branch 'upstream' into bug/compiler-flags

Conflicts:

src/cf/osconf.m4
src/cf/osconf.m4