]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 12 Jan 2012 16:16:46 +0000 (17:16 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 12 Jan 2012 16:16:46 +0000 (17:16 +0100)

Trivial merge