From: Bdale Garbee <bdale@gag.com>
Date: Wed, 10 Nov 2010 22:42:51 +0000 (-0700)
Subject: Merge branch 'dfsg-orig' into dfsg-debian
X-Git-Tag: debian/1.25-1~4
X-Git-Url: https://git.gag.com/?p=debian%2Ftar;a=commitdiff_plain;h=cc5892ba8cbe46ac2f5ad3758293cebdb7003319

Merge branch 'dfsg-orig' into dfsg-debian
---

cc5892ba8cbe46ac2f5ad3758293cebdb7003319