[Merge] lp:~unity-team/telephony-service/revert-split-greeter into lp:telephony-service

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:822
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/201/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/17/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/201/rebuild

-- 
https://code.launchpad.net/~unity-team/telephony-service/revert-split-greeter/+merge/221803
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~unity-team/telephony-service/revert-split-greeter into lp:telephony-service.