Merge "New AMI Command Output Format"
authorMatt Jordan <mjordan@digium.com>
Thu, 23 Apr 2015 11:31:16 +0000 (06:31 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 23 Apr 2015 11:31:16 +0000 (06:31 -0500)

Trivial merge