From: Joshua Colp <jcolp@digium.com>
Date: Wed, 8 Jun 2016 10:13:37 +0000 (-0500)
Subject: Merge "ari/resource_channels:  Add 'formats' to channel create/originate"
X-Git-Tag: 14.0.0-beta1~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=643dd462ee3e37de09b04c8f5abea1177f246731;p=thirdparty%2Fasterisk.git

Merge "ari/resource_channels:  Add 'formats' to channel create/originate"
---

643dd462ee3e37de09b04c8f5abea1177f246731