From: Bdale Garbee <bdale@gag.com>
Date: Mon, 26 Dec 2011 08:02:16 +0000 (-0700)
Subject: Merge commit 'upstream/2.13'
X-Git-Tag: debian/2.13-1~3
X-Git-Url: https://git.gag.com/?p=debian%2Fcpmtools;a=commitdiff_plain;h=4da0ef28bc10c3dfa72b8d2c7e7f8db7a186bcbc

Merge commit 'upstream/2.13'
---

4da0ef28bc10c3dfa72b8d2c7e7f8db7a186bcbc