git.michaelhowe.org Git - packages/b/bup.git/commit

]> git.michaelhowe.org Git - packages/b/bup.git/commit

projects / packages / b / bup.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 00356d4 3e8ff2f)

author	Jon Dowland <jmtd@debian.org>
	Tue, 6 Apr 2010 21:28:24 +0000 (22:28 +0100)
committer	Jon Dowland <jmtd@debian.org>
	Tue, 6 Apr 2010 21:28:24 +0000 (22:28 +0100)
commit	ac35d0ec23d00190e0f1738e763f3deb6cf2c88d
tree	b9848b8f43ad2e5385a16590f4178dc3532d6ba5	tree \| snapshot
parent	00356d4c33010d04cf92412de2faabfbd4426367	commit \| diff
parent	3e8ff2fb0bd7f1645624c258964336da4b34fc25	commit \| diff

Merge branch 'debian' into debian-common

Conflicts:
debian/control