From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 14 Mar 2013 20:00:54 +0000 (-0700)
Subject: Merge branch 'don/fix_encoding'
X-Git-Tag: release/2.6.0~312
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=3ba6064542c75036f956ab24c7fccbd9bb6fcf29

Merge branch 'don/fix_encoding'
---

3ba6064542c75036f956ab24c7fccbd9bb6fcf29