Call Diversion AS
Merge pull request #192 from Metaswitch/sto985

[Reviewer: Andy] Call Diversion AS