From: Joshua Colp <jcolp@digium.com>
Date: Mon, 20 Jul 2015 23:30:47 +0000 (-0500)
Subject: Merge "Documentation: A couple of trivial fixes in sip.conf.sample and func_cdr.c"
X-Git-Tag: 14.0.0-beta1~784
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3143bb2e8846242607294048d29e1ded70172b04;p=thirdparty%2Fasterisk.git

Merge "Documentation: A couple of trivial fixes in sip.conf.sample and func_cdr.c"
---

3143bb2e8846242607294048d29e1ded70172b04