From: Michael Vogt <mvo@ubuntu.com>
Date: Tue, 1 Apr 2014 10:44:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'mvo/feature/apt-manpage' into debian/sid
X-Git-Tag: 1.0~9
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1701312682aad167b4ff3425a8e9b680c04b49a5

Merge remote-tracking branch 'mvo/feature/apt-manpage' into debian/sid

Conflicts:
	cmdline/apt.cc
---

1701312682aad167b4ff3425a8e9b680c04b49a5