Merge remote-tracking branch 'mvo/feature/apt-manpage' into debian/sid
authorMichael Vogt <mvo@ubuntu.com>
Tue, 1 Apr 2014 10:44:08 +0000 (12:44 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Tue, 1 Apr 2014 10:44:08 +0000 (12:44 +0200)
Conflicts:
cmdline/apt.cc


Trivial merge