[Merge] lp:~laney/friends/eds-3.8 into lp:friends

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

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

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

-- 
https://code.launchpad.net/~laney/friends/eds-3.8/+merge/166326
Your team Super Friends is subscribed to branch lp:friends.