[Merge] lp:~ssweeny/friends/fix-lp1258657 into lp:friends

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:253
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ssweeny/friends/fix-lp1258657/+merge/206650/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/friends-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-trusty-amd64-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/friends-ci/56/rebuild

-- 
https://code.launchpad.net/~ssweeny/friends/fix-lp1258657/+merge/206650
Your team Super Friends is requested to review the proposed merge of lp:~ssweeny/friends/fix-lp1258657 into lp:friends.