]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'v1.2.stable' of fs-git:freeswitch into v1.2.stable
authorRaymond Chandler <intralanman@gmail.com>
Wed, 3 Jul 2013 18:57:39 +0000 (14:57 -0400)
committerRaymond Chandler <intralanman@gmail.com>
Wed, 3 Jul 2013 18:57:39 +0000 (14:57 -0400)

Trivial merge