]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of belledonne-communications.com:linphone-private into dev_mult...
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 28 Apr 2010 15:15:27 +0000 (17:15 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 28 Apr 2010 15:15:27 +0000 (17:15 +0200)

Trivial merge