]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Mon, 24 Oct 2011 11:59:50 +0000 (13:59 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Mon, 24 Oct 2011 11:59:50 +0000 (13:59 +0200)

Trivial merge