Call Diversion AS
Code review mark-ups!
Merge pull request #104 from Metaswitch/sto985

[Reviewer: Andy] Call Diversion AS