chiark / gitweb /
~ianmdlvl / xtrlock.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bd23210 3875bb0)
Merge tag 'release_2.6' into dgit/sid
authorMatthew Vernon <matthew@debian.org>
Wed, 8 Jan 2014 08:35:19 +0000 (08:35 +0000)
committerMatthew Vernon <matthew@debian.org>
Wed, 8 Jan 2014 08:35:19 +0000 (08:35 +0000)
commit633221b7ec9a9ff782e4f07fe5b7cf0852bbdbcf
tree38dbfc0ac81d3e3cdd1d5a555adc9bdd75774dfdtree | snapshot
parentbd23210709886d1585494c9153dfcbd938a1a767commit | diff
parent3875bb093e2137a8e1a032e55af9446255572c5ecommit | diff
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.
Unnamed repository; edit this file 'description' to name the repository.