]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorMichal Bielicki <michal.bielicki@seventhsignal.de>
Mon, 2 Jan 2012 13:58:19 +0000 (14:58 +0100)
committerMichal Bielicki <michal.bielicki@seventhsignal.de>
Mon, 2 Jan 2012 13:58:19 +0000 (14:58 +0100)

Trivial merge