Merge commit 'upstream/1.7.2'
authorBdale Garbee <bdale@gag.com>
Wed, 15 Jul 2009 06:53:55 +0000 (00:53 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 15 Jul 2009 06:53:55 +0000 (00:53 -0600)
commit967e372b4817accfd07afe09c8934052beed1a2c
tree7e22c70812ce453c7a36dc52089ab53a21f4aa42
parent83e3847cf7ae74e5b8e8fb2ca755b8ca114fcc90
parent83dab3b7ab098ba1c093964e7ff862f287c8a12c
Merge commit 'upstream/1.7.2'

Conflicts:
Makefile.in
sudoers.pod
Makefile.in
debian/changelog
env.c
sudo.c
sudo.h
sudo.man.in
sudo.pod
sudoers.man.in
sudoers.pod
visudo.man.in