]> git.michaelhowe.org Git - packages/b/bup.git/commitdiff
projects / packages / b / bup.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7608edb 417bf80)
Merge branch 'debian' into debian-common
authorJon Dowland <jmtd@debian.org>
Tue, 27 Apr 2010 18:59:09 +0000 (19:59 +0100)
committerJon Dowland <jmtd@debian.org>
Tue, 27 Apr 2010 18:59:09 +0000 (19:59 +0100)
Conflicts:
debian/control
debian/rules


Trivial merge