From: Anthony Minessale II <anthony.minessale@gmail.com>
Date: Fri, 22 Jan 2016 05:32:49 +0000 (-0600)
Subject: Merge pull request #652 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-8571... 
X-Git-Tag: v1.6.7~2^2~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=013fb1d29c9130774df79fd0ca2d43f4695c047d;p=thirdparty%2Ffreeswitch.git

Merge pull request #652 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-8571-configure-with-disable-srtp-breaks to master

* commit 'e3e6bd875747c379ae78e7528dc66ce210c24ed9':
  Add missing ENABLE_SRTP ifdef to allow building without SRTP
---

013fb1d29c9130774df79fd0ca2d43f4695c047d