]> git.michaelhowe.org Git - packages/o/openafs.git/commit
Merge commit 'upstream/1.4.11.pre1+dfsg1'
authorRuss Allbery <rra@debian.org>
Wed, 17 Jun 2009 20:21:54 +0000 (13:21 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 17 Jun 2009 20:21:54 +0000 (13:21 -0700)
commit34db1c5de9d2770018c34290cf5a9c9ebf797e31
treeb8667151e9ca5a55d01a8578dfba5686ce7574de
parenta563de604dae60f5cc1ab6ea30d520caafb442eb
parentfda3ae8cbb8d42544c4b1079b6f251aa00d6a25a
Merge commit 'upstream/1.4.11.pre1+dfsg1'

Conflicts:
src/afs/Makefile.in
configure.in
src/afs/Makefile.in
src/cf/osconf.m4