Viewing all changes in revision 24.

Committer: Michael Vogt
Date: 2015-04-09 15:47:33 UTC
mfrom: <a title="Merged From 22.2.4" href="/~jamesodhunt/ubuntu/vivid/ubuntu-core-upgrader/bug-1435774/revision/22.2.4">(22.2.4 ubuntu-core-upgrader-bug-handle-invalid-removed-file)
Revision ID: michael.vogt@ubuntu.com-20150409154733-hatmyned4qqg2j9f

merged lp:~jamesodhunt/ubuntu/vivid/ubuntu-core-upgrader/handle-invalid-removed-file and resolved conflicts

added added

removed removed