]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of belledonne-communications.com:linphone-private into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 10 Mar 2010 20:50:00 +0000 (21:50 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 10 Mar 2010 20:50:00 +0000 (21:50 +0100)

Trivial merge