]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 30 Nov 2010 21:12:26 +0000 (22:12 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 30 Nov 2010 21:12:26 +0000 (22:12 +0100)

Trivial merge