]> git.michaelhowe.org Git - packages/b/bup.git/commit
Merge branch 'master' into debian
authorRobert S. Edmonds <edmonds@debian.org>
Thu, 8 Aug 2013 22:03:42 +0000 (18:03 -0400)
committerRobert S. Edmonds <edmonds@debian.org>
Thu, 8 Aug 2013 22:03:42 +0000 (18:03 -0400)
commit22a8600f0ea8cddb07d00e253f4c37429cb09590
treee2d2d7e5c54d124c8e36282c1281487056bfd4c9
parent94a9dab2f64454e2fb81d78c2691ce1b55e588bf
parent53ffc4d336b06b3cecac0d817d192d22cb75a1bd
Merge branch 'master' into debian

Conflicts:
Makefile
Makefile
config/configure