From: Bdale Garbee <bdale@gag.com>
Date: Thu, 28 Jun 2012 18:01:08 +0000 (-0600)
Subject: Merge tag 'upstream/1.8.5p2'
X-Git-Tag: debian/1.8.5p2-1~2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=64659945d8385e32986f184535bb64b76d780e37;hp=-c;p=debian%2Fsudo

Merge tag 'upstream/1.8.5p2'

Upstream version 1.8.5p2
---

64659945d8385e32986f184535bb64b76d780e37