Merge branch 'debian/sid' into feature/apt-manpage
authorMichael Vogt <mvo@debian.org>
Mon, 6 Jan 2014 06:51:45 +0000 (07:51 +0100)
committerMichael Vogt <mvo@debian.org>
Mon, 6 Jan 2014 06:51:45 +0000 (07:51 +0100)
commit1b4560fec66a6e7b2dff9aaa19095fb8423f69a0
tree7fb2b63e31f356ef87af4699ba87b4f1443f508c
parent81d183681aea972fddd453d62109f8ccda3f447a
parent74d4bb26e09146b9d5f01889a676dc58ff5d63cd
Merge branch 'debian/sid' into feature/apt-manpage
cmdline/apt.cc
doc/apt-verbatim.ent
doc/makefile