]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 8 Nov 2012 18:23:11 +0000 (19:23 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 8 Nov 2012 18:23:11 +0000 (19:23 +0100)

Trivial merge