]> git.michaelhowe.org Git - packages/b/bup.git/commit
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)
commit49cba5a9fd948c05765bf7ebb56b62db7dad2cf1
treee46e2092d8a842bf2662c2da2ebddb0601dc37bc
parent7608edb8ab67af83ba6de0564afcd4d261822773
parent417bf80eed8ebb2cfd20d7a50944ede94e33d272
Merge branch 'debian' into debian-common

Conflicts:
debian/control
debian/rules