[Merge] lp:~pete-woods/net-cpp/uri-builder into lp:net-cpp

[Thomas Voß]

> Before I go changing the rest of the test suite, is this more what you wanted?

Yes, that matches my mental model :) thanks.
-- 
https://code.launchpad.net/~pete-woods/net-cpp/uri-builder/+merge/222614
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~pete-woods/net-cpp/uri-builder into lp:net-cpp.