From: Brian West <brian@freeswitch.org>
Date: Thu, 2 Jul 2015 14:45:27 +0000 (-0500)
Subject: Merge pull request #140 in FS/freeswitch from ~ARON45/freeswitch:FS-5945 to master
X-Git-Tag: v1.6.2~358
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b86c7303485b25258b4693a20150a64efb385cf;p=thirdparty%2Ffreeswitch.git

Merge pull request #140 in FS/freeswitch from ~ARON45/freeswitch:FS-5945 to master

* commit '2cad5a6940bb76458e909a56c5e5e35e622467ed':
  more whitespace cleanup
  fixed indentation
  cleanup
  cond api return -ERR on all syntax errors
  FS-5945 - cond api improved
  FS-5945 - cond api escape special charactars
---

1b86c7303485b25258b4693a20150a64efb385cf