]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
git push
authorBrian West <brian@freeswitch.org>
Mon, 23 Jun 2014 21:40:09 +0000 (16:40 -0500)
committerBrian West <brian@freeswitch.org>
Mon, 23 Jun 2014 21:40:09 +0000 (16:40 -0500)
Merge branch 'v1.2.stable' of ssh://git.freeswitch.org/freeswitch into v1.2.stable


Trivial merge