From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 6 Jul 2012 17:55:47 +0000 (-0700)
Subject: Merge branch 'master' into cgiencoding
X-Git-Tag: release/2.6.0~376^2~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6ce4d79d48f520bb4936ec99e78bcd706539f18b;p=debbugs.git

Merge branch 'master' into cgiencoding
---

6ce4d79d48f520bb4936ec99e78bcd706539f18b