From: Matthew Vernon <matthew@debian.org>
Date: Wed, 8 Jan 2014 08:35:19 +0000 (+0000)
Subject: Merge tag 'release_2.6' into dgit/sid
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=xtrlock.git;a=commitdiff_plain;h=633221b7ec9a9ff782e4f07fe5b7cf0852bbdbcf

Merge tag 'release_2.6' into dgit/sid

At least in theory, a trivial merge, part of wiring dgit into the
packaging (see the dgit manual). Dgit made a synthetic commit from the
archive, and that needs to be brought into my git history.
---

633221b7ec9a9ff782e4f07fe5b7cf0852bbdbcf