From: Bdale Garbee <bdale@gag.com>
Date: Thu, 11 Nov 2010 04:07:58 +0000 (-0700)
Subject: Merge branch 'doc-orig' into doc-debian
X-Git-Tag: non-free/1.25-1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8ace0bd70015270f0a19e8fe2676695b9ac4b2be;p=debian%2Ftar

Merge branch 'doc-orig' into doc-debian
---

8ace0bd70015270f0a19e8fe2676695b9ac4b2be