Merge "Documentation: A couple of trivial fixes in sip.conf.sample and func_cdr.c"
authorJoshua Colp <jcolp@digium.com>
Mon, 20 Jul 2015 23:30:47 +0000 (18:30 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 20 Jul 2015 23:30:47 +0000 (18:30 -0500)

Trivial merge