[Merge] lp:~ssweeny/friends-app/lp1261438 into lp:friends-app

[PS Jenkins bot]

Review: Approve continuous-integration

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/friends-app-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2931
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3263
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3263/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2933
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2933/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5337
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3992

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

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