]> sjero.net Git - linphone/commitdiff
Merge branch 'master' into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 21 Jan 2010 12:54:19 +0000 (13:54 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 21 Jan 2010 12:54:19 +0000 (13:54 +0100)

Trivial merge