[Merge] lp:~cjwatson/friends-app/dh-python2 into lp:friends-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/friends-app-autolanding/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-saucy-amd64-autolanding/17
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4202/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/70/console

-- 
https://code.launchpad.net/~cjwatson/friends-app/dh-python2/+merge/188338
Your team Super Friends is subscribed to branch lp:friends-app.