Merge tag 'debian/1.8.5p2-1' into squeeze
authorBdale Garbee <bdale@gag.com>
Tue, 25 Sep 2012 16:23:23 +0000 (10:23 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 25 Sep 2012 16:23:23 +0000 (10:23 -0600)
commit6ad45aa23af5f5f3b54468937d6a13089201b891
tree8939aa740069ba6fddcc4b7ff668817b3da97065
parent97bd3ae46779c69fcdab82d0c64bdf05be009ec3
parent6b7c3818471f293558e168c110b8794cb5f3e752
Merge tag 'debian/1.8.5p2-1' into squeeze

Conflicts:
debian/changelog
plugins/sudoers/check.c
plugins/sudoers/env.c
debian/changelog
plugins/sudoers/env.c