From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 14 Mar 2013 22:04:07 +0000 (-0700)
Subject: Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/debbugs
X-Git-Tag: release/2.6.0~308
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=ca9a45a0d04dd68229ed0f840c51eaca15ac1120

Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/debbugs
---

ca9a45a0d04dd68229ed0f840c51eaca15ac1120