From: Mathieu Rene <mrene@avgs.ca>
Date: Wed, 20 Jun 2012 19:43:20 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
X-Git-Tag: v1.2.0~290
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0a9efcf025d8614708c5dd72c0719cfcdd8084f;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
---

a0a9efcf025d8614708c5dd72c0719cfcdd8084f