From: Bdale Garbee <bdale@gag.com>
Date: Tue, 4 Aug 2009 18:15:20 +0000 (-0600)
Subject: Merge commit 'cworth/master' into dfsg-debian
X-Git-Tag: debian/1.22-2~3
X-Git-Url: https://git.gag.com/?p=debian%2Ftar;a=commitdiff_plain;h=5de13253a6452a29eedec21a53980febd6d3b2b9

Merge commit 'cworth/master' into dfsg-debian

Conflicts:
	debian/changelog
	debian/control
---

5de13253a6452a29eedec21a53980febd6d3b2b9