]> sjero.net Git - linphone/commitdiff
Merge remote-tracking branch 'public/master' into tunnel
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 24 Jan 2012 17:13:53 +0000 (18:13 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 24 Jan 2012 17:13:53 +0000 (18:13 +0100)

Trivial merge