From: Bdale Garbee <bdale@gag.com>
Date: Wed, 16 May 2012 15:20:45 +0000 (-0600)
Subject: Merge tag 'upstream/1.8.5'
X-Git-Tag: debian/1.8.5p2-1~17
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=c715e9a420f6d1d16bd6cd11f8d8e14c9b2fc85d;p=debian%2Fsudo

Merge tag 'upstream/1.8.5'

Upstream version 1.8.5
---

c715e9a420f6d1d16bd6cd11f8d8e14c9b2fc85d