]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 25 Oct 2011 10:48:51 +0000 (12:48 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 25 Oct 2011 10:48:51 +0000 (12:48 +0200)

Trivial merge