Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage
authorMichael Vogt <mvo@ubuntu.com>
Tue, 1 Apr 2014 10:28:56 +0000 (12:28 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Tue, 1 Apr 2014 10:28:56 +0000 (12:28 +0200)
commitbe20eef52da4b7f361333ea70a8d705a98ae779e
tree4177a110ce6b1335fc4b85d5e53b298a65661f39
parenta555cf8be53d8b5557f004ecbde8482a169b79f3
parent21b3eac8f9ab8e12b43fa8998a5aa5465f29adc5
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage

Conflicts:
cmdline/apt.cc
cmdline/apt.cc
doc/apt-verbatim.ent