Viewing all changes in revision 7.

Committer: Tarmac
Author(s): Christopher Lee
Date: 2013-05-03 15:37:40 UTC
mfrom: <a title="Merged From 6.1.3" href="/~sil2100/python-ubuntu-platform-api/packaging_review/revision/6.1.3">(6.1.3 merge_thomir_aal_branch)
Revision ID: tarmac-20130503153740-klpz62vth5a0tskx

Merge in differences between 2 existing branches. Bringing in functionality from both.

Approved by PS Jenkins bot.

added added

removed removed