From: Joshua Colp <jcolp@digium.com>
Date: Tue, 23 Jun 2015 17:54:03 +0000 (-0500)
Subject: Merge "res_pjsip_outbound_registration.c: Fix whitespace conflict potential."
X-Git-Tag: 14.0.0-beta1~867
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39c79cd6fb661269b8505247a2dea1ae7b7aad81;p=thirdparty%2Fasterisk.git

Merge "res_pjsip_outbound_registration.c: Fix whitespace conflict potential."
---

39c79cd6fb661269b8505247a2dea1ae7b7aad81