From: Jeff Lenk <jeff@jefflenk.com>
Date: Tue, 4 Mar 2014 03:11:23 +0000 (-0600)
Subject: Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable
X-Git-Tag: v1.2.23~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2287c55ce3721962950d65fe6eabecc2aa9313a9;p=thirdparty%2Ffreeswitch.git

Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable
---

2287c55ce3721962950d65fe6eabecc2aa9313a9