[Merge] lp:~robru/friends/neuter into lp:friends

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:257
http://jenkins.qa.ubuntu.com/job/friends-ci/59/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/friends-utopic-amd64-ci/2/console

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

-- 
https://code.launchpad.net/~robru/friends/neuter/+merge/226724
Your team Super Friends is requested to review the proposed merge of lp:~robru/friends/neuter into lp:friends.