Merge "res_pjsip_outbound_registration.c: Fix whitespace conflict potential."
authorJoshua Colp <jcolp@digium.com>
Tue, 23 Jun 2015 17:54:03 +0000 (12:54 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 23 Jun 2015 17:54:03 +0000 (12:54 -0500)

Trivial merge