git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13468 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13467 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13466 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13465 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13464 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13463 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13462 d0543943-73ff-0310-b7d9-9358b9ac24b2

 zrtp_secure_media=true will have to be set to true in order for your zrtp to work moving forward similar to how srtp_secure_media works.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13461 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13460 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13459 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13458 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13457 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13456 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13455 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13454 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13453 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13452 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13451 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13450 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13449 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13448 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13447 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13446 d0543943-73ff-0310-b7d9-9358b9ac24b2

 you can call 9999 from a zrtp endpoint and enroll this should be replaced with an IVR to explain it a bit but most of the work happens client side at this point 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13445 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13444 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13443 d0543943-73ff-0310-b7d9-9358b9ac24b2

add conference wait-mod flags and member moderator flag to delay starting a conference until someone with a moderator flag has joined

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13442 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13441 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13440 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13439 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13438 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13437 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13436 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13435 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13434 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13433 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13431 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13430 d0543943-73ff-0310-b7d9-9358b9ac24b2

 adding back options, build skew DAMN YOU.  Also adding zrtp_sas1_string and zrtp_sas2_string variables.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13429 d0543943-73ff-0310-b7d9-9358b9ac24b2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13428 d0543943-73ff-0310-b7d9-9358b9ac24b2