Merge branch 'upstream'
authorBdale Garbee <bdale@gag.com>
Thu, 15 May 2008 06:45:29 +0000 (00:45 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 15 May 2008 06:45:29 +0000 (00:45 -0600)
commitfb7645a1633a5422a294859f07981dc7f4b9c4e3
tree8224cf679a6e8980e85e31a2e68cce3aacf27129
parent90c6abb426afca47aeb2bf90e4d75778521aafd4
parent17fe41bae8a65fb88683c9795414556ed9b636e9
Merge branch 'upstream'

Conflicts:

CHANGES
Makefile.in
config.sub
configure
configure.in
env.c
ldap.c
sample.sudoers
sudo.c
sudo.cat
sudo.man.in
sudo.pod
sudoers.cat
sudoers.man.in
sudoers.pod
version.h
visudo.cat
visudo.man.in
Makefile.in
configure
sample.sudoers
sudo.c
sudo.cat
sudo.man.in
sudoers.man.in
sudoers.pod
visudo.man.in