Merge branch 'ifc-priority-optional' of github.com:Metaswitch/sprout into dev
Merge branch 'dev' of github.com:Metaswitch/sprout into dev
Merge pull request #39 from Metaswitch/ut-robustness

[Reviewer: Matt] UT robustness
Merge branch 'dev' of github.com:Metaswitch/sprout into dev
Change SipTest::poll to use 1ms timeout instead of 0ms
Commonalise common operations on Route headers
Add service route on all 200 responses to REGISTER requests
Include the trusted port number
Merge pull request #42 from Metaswitch/add-service-route

Add service route to successful REGISTER responses
Review markup: comment initial ref count.
Merge pull request #30 from Metaswitch/ref-counting

[Reviewer: Mike] Track lifetime of AsChain objects more precisely.
Code review updates
Merge pull request #41 from Metaswitch/refactor-route-hdr

[Reviewer Keith] Commonalise common operations on Route headers
Merge branch 'dev' of github.com:Metaswitch/sprout into reeval-ifcs

Conflicts:
	sprout/aschain.cpp